summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorNikanth Karthikesan <knikanth@suse.de>2009-04-02 16:56:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-02 19:04:49 -0700
commit97f76d3d197f201ac8a8a3ced5b8fef81568e50e (patch)
tree8264f920a1f1a83e9cb0247ffe9390a7b6332852 /fs
parent9a896c9a48ac6704c0ce8ee081b836644d0afe40 (diff)
vfs: check bh->b_blocknr only if BH_Mapped is set
Check bh->b_blocknr only if BH_Mapped is set. akpm: I doubt if b_blocknr is ever uninitialised here, but it could conceivably cause a problem if we're doing a lookup for block zero. Signed-off-by: Nikanth Karthikesan <knikanth@suse.de> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/buffer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index f5f8b15a6e4..2963858f0f3 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -199,13 +199,13 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)
head = page_buffers(page);
bh = head;
do {
- if (bh->b_blocknr == block) {
+ if (!buffer_mapped(bh))
+ all_mapped = 0;
+ else if (bh->b_blocknr == block) {
ret = bh;
get_bh(bh);
goto out_unlock;
}
- if (!buffer_mapped(bh))
- all_mapped = 0;
bh = bh->b_this_page;
} while (bh != head);