diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-06 17:59:47 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-06 17:59:47 +1100 |
commit | 3424e82515bf0781df6fe6e621ce4bdfa4bf4a16 (patch) | |
tree | 1da0c5f1055d557d12b0d766db70bbe83fa200b1 /fs/jfs/super.c | |
parent | 71942a3b7471b768b07095731928558fd18a831d (diff) | |
parent | 46c3b4fb248255cf78eb4680802b1ce411bcd87d (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'fs/jfs/super.c')
-rw-r--r-- | fs/jfs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 2be7c9ce6663..c64c2574a0aa 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c @@ -758,7 +758,7 @@ static ssize_t jfs_quota_read(struct super_block *sb, int type, char *data, sb->s_blocksize - offset : toread; tmp_bh.b_state = 0; - tmp_bh.b_size = 1 << inode->i_blkbits; + tmp_bh.b_size = i_blocksize(inode); err = jfs_get_block(inode, blk, &tmp_bh, 0); if (err) return err; @@ -798,7 +798,7 @@ static ssize_t jfs_quota_write(struct super_block *sb, int type, sb->s_blocksize - offset : towrite; tmp_bh.b_state = 0; - tmp_bh.b_size = 1 << inode->i_blkbits; + tmp_bh.b_size = i_blocksize(inode); err = jfs_get_block(inode, blk, &tmp_bh, 1); if (err) goto out; |