diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 02:01:14 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 02:01:14 -0400 |
| commit | cf9fe114e3b37e14fc8434d5abb192e35df551b1 (patch) | |
| tree | 0f82879295dc792f9df1a3ce79e143a3c073510f /fs/buffer.c | |
| parent | c1d0d32a603ed06377f404adf2c538de33bb3634 (diff) | |
| parent | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 aed297739eb0..49106127a4aa 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -2736,6 +2736,8 @@ has_buffers: | |||
| 2736 | pos += blocksize; | 2736 | pos += blocksize; |
| 2737 | } | 2737 | } |
| 2738 | 2738 | ||
| 2739 | map_bh.b_size = blocksize; | ||
| 2740 | map_bh.b_state = 0; | ||
| 2739 | err = get_block(inode, iblock, &map_bh, 0); | 2741 | err = get_block(inode, iblock, &map_bh, 0); |
| 2740 | if (err) | 2742 | if (err) |
| 2741 | goto unlock; | 2743 | goto unlock; |