diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-23 17:24:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-23 17:24:38 -0800 |
| commit | dc0a6b4fee04f99a3db3dd5affcce440dc0c4b7e (patch) | |
| tree | 543f50d7f94611d7ebf75c7ac01c631c4943e0e8 | |
| parent | 6961bc6c7055d0d1b2a670dbdca2c0165e267514 (diff) | |
| parent | df4e7ac0bb70abc97fbfd9ef09671fc084b3f9db (diff) | |
| download | op-kernel-dev-dc0a6b4fee04f99a3db3dd5affcce440dc0c4b7e.zip op-kernel-dev-dc0a6b4fee04f99a3db3dd5affcce440dc0c4b7e.tar.gz | |
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()
| -rw-r--r-- | fs/ext2/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 2885349..20d6697 100644 --- a/fs/ext2/super.c +++ b/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; |
