diff --git a/[refs] b/[refs]
index 3e24c58728f9..f422589d2d80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a896c9a48ac6704c0ce8ee081b836644d0afe40
+refs/heads/master: 97f76d3d197f201ac8a8a3ced5b8fef81568e50e
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index f5f8b15a6e40..2963858f0f31 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/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);