Messages in this thread | | | Date | Mon, 23 Jan 2017 10:28:56 +0900 (JST) | Subject | Re: [PATCH 1/2] nilfs2: use i_blocksize() | From | Ryusuke Konishi <> |
| |
On Fri, 20 Jan 2017 22:34:57 +0800, Geliang Tang wrote: > Since i_blocksize() helper has been defined in fs.h, use it instead > of open-coding. > > Signed-off-by: Geliang Tang <geliangtang@gmail.com>
i_blocksize() doesn't exist in the mainline kernel.
This needs another patch titled "fs: add i_blocksize()" which I found in the latest -mm tree.
I will send this to the -mm tree along with this dependency.
Regards, Ryusuke Konishi
> --- > fs/nilfs2/alloc.c | 2 +- > 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 2c90e28..03b8ba9 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 2e315f9..d75238a 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) > -- > 2.9.3 >
| |