Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/jack/linux-fs

Pull ext2 fix from Jan Kara:
 "One simple fix of oops in ext2 which was recently hit by Christoph"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext2: Fix oops in ext2_get_block() called from ext2_quota_write()

fs/ext2/super.c

@@ -1493,6 +1493,7 @@ static ssize_t ext2_quota_write(struct super_block *sb, int type,
  sb->s_blocksize - offset : towrite;
 
  tmp_bh.b_state = 0;
+ tmp_bh.b_size = sb->s_blocksize;
  err = ext2_get_block(inode, blk, &tmp_bh, 1);
  if (err < 0)
  goto out;