diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-06 12:18:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-06 12:18:14 -0700 |
| commit | 81ee1bad86bd6752c626018d43a74e3f81f1ae72 (patch) | |
| tree | fb4b04433a95989dddd7729be3fe6a3250c90cb5 /fs/buffer.c | |
| parent | 9ccb1aa16cef6316831fef61e4aeaa3784035cb8 (diff) | |
| parent | 72a43d63cb51057393edfbcfc4596066205ad15d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
ext3/4 with synchronous writes gets wedged by Postfix
Fix nobh_truncate_page() to not pass stack garbage to get_block()
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index aed297739eb..49106127a4a 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2736,6 +2736,8 @@ has_buffers: pos += blocksize; } + map_bh.b_size = blocksize; + map_bh.b_state = 0; err = get_block(inode, iblock, &map_bh, 0); if (err) goto unlock; |