diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-11-11 16:31:56 -0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-11-25 10:15:14 -0800 |
| commit | a7de608691f766cd148971a71d4f13aa1692d4c8 (patch) | |
| tree | b828eadd8698660cc6471521db44feaaa684daf4 /fs/f2fs/data.c | |
| parent | 3c62be17d4f562f43fe1d03b48194399caa35aa5 (diff) | |
| download | linux-stable-a7de608691f766cd148971a71d4f13aa1692d4c8.tar.gz linux-stable-a7de608691f766cd148971a71d4f13aa1692d4c8.tar.bz2 linux-stable-a7de608691f766cd148971a71d4f13aa1692d4c8.zip | |
f2fs: use err for f2fs_preallocate_blocks
This patch has no functional change.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/data.c')
| -rw-r--r-- | fs/f2fs/data.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 861173f00459..2938311c97bf 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -658,11 +658,11 @@ alloc: return 0; } -ssize_t f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *from) +int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *from) { struct inode *inode = file_inode(iocb->ki_filp); struct f2fs_map_blocks map; - ssize_t ret = 0; + int err = 0; map.m_lblk = F2FS_BLK_ALIGN(iocb->ki_pos); map.m_len = F2FS_BYTES_TO_BLK(iocb->ki_pos + iov_iter_count(from)); @@ -674,19 +674,19 @@ ssize_t f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *from) map.m_next_pgofs = NULL; if (iocb->ki_flags & IOCB_DIRECT) { - 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 (iocb->ki_pos + iov_iter_count(from) > 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; } /* @@ -863,19 +863,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, |