On Fri, Jan 20, 2017 at 10:29:52PM +0800, Geliang Tang wrote: > Since i_blocksize() helper has been defined in fs.h, use it instead > of open-coding.
which tree is this patch applied to? I can't find it in Linus's tree > Signed-off-by: Geliang Tang <[email protected]> > --- > drivers/md/bitmap.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c > index 9fb2cca..30b1b89 100644 > --- a/drivers/md/bitmap.c > +++ b/drivers/md/bitmap.c > @@ -367,7 +367,7 @@ static int read_page(struct file *file, unsigned long > index, > pr_debug("read bitmap file (%dB @ %llu)\n", (int)PAGE_SIZE, > (unsigned long long)index << PAGE_SHIFT); > > - bh = alloc_page_buffers(page, 1<<inode->i_blkbits, 0); > + bh = alloc_page_buffers(page, i_blocksize(inode), 0); > if (!bh) { > ret = -ENOMEM; > goto out; > @@ -385,10 +385,10 @@ static int read_page(struct file *file, unsigned long > index, > goto out; > } > bh->b_bdev = inode->i_sb->s_bdev; > - if (count < (1<<inode->i_blkbits)) > + if (count < i_blocksize(inode)) > count = 0; > else > - count -= (1<<inode->i_blkbits); > + count -= i_blocksize(inode); > > bh->b_end_io = end_bitmap_write; > bh->b_private = bitmap; > -- > 2.9.3 >
