From f938494cd0e71d094e8e236788c362fd5b796ac6 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@hera.kernel.org>
Date: Fri, 27 May 2005 01:17:08 -0700
Subject: [PATCH] --- yaml --- r: 1467 b: refs/heads/master c:
 66f5507133f97088e553b1c8f8d341a0efd438f9 h: refs/heads/master i:   1465:
 57364940961645a5ec98139acd83a47ac7c71ce7   1463:
 d59544405a320005cec2f4bcb71ade9e446450fb v: v3

---
 [refs]                            | 2 +-
 trunk/fs/xfs/linux-2.6/xfs_aops.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d8b4135ebe7d..695f98a47423 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b19312c4c8f3f84da57bba01d45549df1cf10dcd
+refs/heads/master: 66f5507133f97088e553b1c8f8d341a0efd438f9
diff --git a/trunk/fs/xfs/linux-2.6/xfs_aops.c b/trunk/fs/xfs/linux-2.6/xfs_aops.c
index 9278e9aba9ba..93ce257cd149 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_aops.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_aops.c
@@ -886,7 +886,6 @@ xfs_page_state_convert(
 		SetPageUptodate(page);
 
 	if (startio) {
-		WARN_ON(page_dirty);
 		xfs_submit_page(page, wbc, bh_arr, cnt, 0, !page_dirty);
 	}