diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-11-11 16:31:56 -0800 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-13 12:34:27 +0200 |
| commit | d78ce8ef2e85e4f1e5006377100ae99a2e45bbae (patch) | |
| tree | f9b515ed8a79d154583da28a515237a6fafbcf2e /fs/f2fs/data.c | |
| parent | 777997422edb5151d38eb606b2cd4d31232f36c1 (diff) | |
f2fs: use err for f2fs_preallocate_blocks
This patch has no functional change.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Conflicts:
fs/f2fs/data.c
fs/f2fs/f2fs.h
fs/f2fs/file.c
Diffstat (limited to 'fs/f2fs/data.c')
| -rw-r--r-- | fs/f2fs/data.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 56eee8e4e..aa3671c78 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -653,10 +653,11 @@ alloc: return 0; } -ssize_t f2fs_preallocate_blocks(struct inode *inode, loff_t pos, size_t count, bool dio) +int f2fs_preallocate_blocks(struct inode *inode, loff_t pos, + size_t count, bool dio) { struct f2fs_map_blocks map; - ssize_t ret = 0; + int err = 0; map.m_lblk = F2FS_BLK_ALIGN(pos); map.m_len = F2FS_BYTES_TO_BLK(pos + count); @@ -668,19 +669,19 @@ ssize_t f2fs_preallocate_blocks(struct inode *inode, loff_t pos, size_t count, b map.m_next_pgofs = NULL; if (dio) { - ret = f2fs_convert_inline_inode(inode); - if (ret) - return ret; + err = f2fs_convert_inline_inode(inode); + if (err) + return err; return f2fs_map_blocks(inode, &map, 1, F2FS_GET_BLOCK_PRE_DIO); } if (pos + count > MAX_INLINE_DATA) { - ret = f2fs_convert_inline_inode(inode); - if (ret) - return ret; + err = f2fs_convert_inline_inode(inode); + if (err) + return err; } if (!f2fs_has_inline_data(inode)) return f2fs_map_blocks(inode, &map, 1, F2FS_GET_BLOCK_PRE_AIO); - return ret; + return err; } /* @@ -857,19 +858,19 @@ static int __get_data_block(struct inode *inode, sector_t iblock, pgoff_t *next_pgofs) { struct f2fs_map_blocks map; - int ret; + int err; map.m_lblk = iblock; map.m_len = bh->b_size >> inode->i_blkbits; map.m_next_pgofs = next_pgofs; - ret = f2fs_map_blocks(inode, &map, create, flag); - if (!ret) { + err = f2fs_map_blocks(inode, &map, create, flag); + if (!err) { map_bh(bh, inode->i_sb, map.m_pblk); bh->b_state = (bh->b_state & ~F2FS_MAP_FLAGS) | map.m_flags; bh->b_size = map.m_len << inode->i_blkbits; } - return ret; + return err; } static int get_data_block(struct inode *inode, sector_t iblock, |
