diff options
author | Geliang Tang <geliangtang@gmail.com> | 2017-02-27 17:28:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-27 21:43:46 -0500 |
commit | f3048d17d1127f003db10fb8ac9a68610923f783 (patch) | |
tree | 93d49e3fce56599ff682779fbc1751c7ebfbc1ee | |
parent | 1508ddc39ab421c0d0569017b9ca3a5b99b0815b (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>
Signed-off-by: Linus Torvalds <torvalds@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 @@ | |||
34 | static inline unsigned long | 34 | static inline unsigned long |
35 | nilfs_palloc_groups_per_desc_block(const struct inode *inode) | 35 | nilfs_palloc_groups_per_desc_block(const struct inode *inode) |
36 | { | 36 | { |
37 | return (1UL << inode->i_blkbits) / | 37 | return i_blocksize(inode) / |
38 | sizeof(struct nilfs_palloc_group_desc); | 38 | sizeof(struct nilfs_palloc_group_desc); |
39 | } | 39 | } |
40 | 40 | ||
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) | |||
119 | 119 | ||
120 | static int nilfs_btree_node_size(const struct nilfs_bmap *btree) | 120 | static int nilfs_btree_node_size(const struct nilfs_bmap *btree) |
121 | { | 121 | { |
122 | return 1 << btree->b_inode->i_blkbits; | 122 | return i_blocksize(btree->b_inode); |
123 | } | 123 | } |
124 | 124 | ||
125 | static int nilfs_btree_nchildren_per_block(const struct nilfs_bmap *btree) | 125 | static int nilfs_btree_nchildren_per_block(const struct nilfs_bmap *btree) |