diff options
| author |   Chao Yu <yuchao0@huawei.com> | 2018-03-20 23:08:29 +0800 |
|---|---|---|
| committer |   Jaegeuk Kim <jaegeuk@kernel.org> | 2018-03-27 20:09:32 -0700 |
| commit | df033caf51c01edf3d2bfc61b41a9f1e566743ed (patch) | |
| tree | 2cb6bf6d09b90fc21649e2a5a82ee0a1a9829281 /fs/f2fs | |
| parent | f2fs: check blkaddr more accuratly before issue a bio (diff) | |
| download | linux-dev-df033caf51c01edf3d2bfc61b41a9f1e566743ed.tar.xz linux-dev-df033caf51c01edf3d2bfc61b41a9f1e566743ed.zip | |
f2fs: clean up with F2FS_BLK_ALIGN
Clean up F2FS_BYTES_TO_BLK(x + F2FS_BLKSIZE - 1) with F2FS_BLK_ALIGN(x).
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/file.c | 3 | ||||
| -rw-r--r-- | fs/f2fs/node.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index ee88058acd63..8068b015ece5 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -573,7 +573,6 @@ truncate_out: int truncate_blocks(struct inode *inode, u64 from, bool lock) { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); - unsigned int blocksize = inode->i_sb->s_blocksize; struct dnode_of_data dn; pgoff_t free_from; int count = 0, err = 0; @@ -582,7 +581,7 @@ int truncate_blocks(struct inode *inode, u64 from, bool lock) trace_f2fs_truncate_blocks_enter(inode, from); - free_from = (pgoff_t)F2FS_BYTES_TO_BLK(from + blocksize - 1); + free_from = (pgoff_t)F2FS_BLK_ALIGN(from); if (free_from >= sbi->max_file_blocks) goto free_partial; diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index f7886b46478d..ecfc2465da9b 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -2581,8 +2581,7 @@ static int __get_nat_bitmaps(struct f2fs_sb_info *sbi) if (!enabled_nat_bits(sbi, NULL)) return 0; - nm_i->nat_bits_blocks = F2FS_BYTES_TO_BLK((nat_bits_bytes << 1) + 8 + - F2FS_BLKSIZE - 1); + nm_i->nat_bits_blocks = F2FS_BLK_ALIGN((nat_bits_bytes << 1) + 8); nm_i->nat_bits = f2fs_kzalloc(sbi, nm_i->nat_bits_blocks << F2FS_BLKSIZE_BITS, GFP_KERNEL); if (!nm_i->nat_bits) |