---

yaml --- r: 201744 b: refs/heads/master c: 3d9b02e h: refs/heads/master v: v3
git-mirror · Jul 26, 2010 · acd7f4a · acd7f4a
1 parent 9a807d7
commit acd7f4a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4e9181e772b0c8b9038c5822ead368b96c2b533
+refs/heads/master: 3d9b02e3c76531687ab5314e0edf266256f13c2d
diff --git a/trunk/fs/xfs/linux-2.6/xfs_aops.c b/trunk/fs/xfs/linux-2.6/xfs_aops.c
@@ -1125,6 +1125,16 @@ xfs_page_state_convert(
 			continue;
 		}
 
+		/*
+		 * A hole may still be marked uptodate because discard_buffer
+		 * leaves the flag set.
+		 */
+		if (!buffer_mapped(bh) && buffer_uptodate(bh)) {
+			ASSERT(!buffer_dirty(bh));
+			imap_valid = 0;
+			continue;
+		}
+
 		if (imap_valid)
 			imap_valid = xfs_imap_valid(inode, &imap, offset);