From 91671026da32a5ab71abea55bbc4c9f1591da2b8 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@sgi.com>
Date: Fri, 17 Mar 2006 17:26:41 +1100
Subject: [PATCH] --- yaml --- r: 23132 b: refs/heads/master c:
 9cea236492ebabb9545564eb039aa0f477a05c96 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/fs/xfs/linux-2.6/xfs_lrw.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e6fd9cc5a9b3..05c20d1b5011 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce9d37c257ceba5b4d089c544e4673546f647565
+refs/heads/master: 9cea236492ebabb9545564eb039aa0f477a05c96
diff --git a/trunk/fs/xfs/linux-2.6/xfs_lrw.c b/trunk/fs/xfs/linux-2.6/xfs_lrw.c
index ba07b83f988d..2a936bd38ce7 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_lrw.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_lrw.c
@@ -270,6 +270,10 @@ xfs_read(
 		}
 	}
 
+	if (unlikely((ioflags & IO_ISDIRECT) && VN_CACHED(vp)))
+		VOP_FLUSHINVAL_PAGES(vp, ctooff(offtoct(*offset)),
+						-1, FI_REMAPF_LOCKED);
+
 	xfs_rw_enter_trace(XFS_READ_ENTER, &ip->i_iocore,
 				(void *)iovp, segs, *offset, ioflags);
 	ret = __generic_file_aio_read(iocb, iovp, segs, offset);