diff options
| author | Geliang Tang <geliangtang@gmail.com> | 2017-02-08 10:43:43 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 16:03:12 +1100 |
| commit | ec3cc83469ff4e2a99e61e16d22d55b77d87c2c1 (patch) | |
| tree | ad95ae1235598d50db28ca253103326eb5bda527 | |
| parent | 3a113c423bc14a906c7c68c06957c15ad1296b7f (diff) | |
nilfs2: use i_blocksize()
Since i_blocksize() helper has been defined in fs.h, use it instead
of open-coding.
Link: http://lkml.kernel.org/r/1485184655-3895-3-git-send-email-konishi.ryusuke@lab.ntt.co.jp
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | fs/nilfs2/alloc.c | 2 | ||||
| -rw-r--r-- | fs/nilfs2/btree.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c index 2c90e285d7c6..03b8ba933eb2 100644 --- a/fs/nilfs2/alloc.c +++ b/fs/nilfs2/alloc.c @@ -34,7 +34,7 @@ static inline unsigned long nilfs_palloc_groups_per_desc_block(const struct inode *inode) { - return (1UL << inode->i_blkbits) / + return i_blocksize(inode) / sizeof(struct nilfs_palloc_group_desc); } diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c index 9c7ea176ab0f..06ffa135dfa6 100644 --- a/fs/nilfs2/btree.c +++ b/fs/nilfs2/btree.c @@ -119,7 +119,7 @@ nilfs_btree_node_set_nchildren(struct nilfs_btree_node *node, int nchildren) static int nilfs_btree_node_size(const struct nilfs_bmap *btree) { - return 1 << btree->b_inode->i_blkbits; + return i_blocksize(btree->b_inode); } static int nilfs_btree_nchildren_per_block(const struct nilfs_bmap *btree) |