From 14a14ed4f436939fc7465b807f292a5081dbfbc8 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@sgi.com>
Date: Thu, 28 Sep 2006 11:05:33 +1000
Subject: [PATCH] --- yaml --- r: 37161 b: refs/heads/master c:
 edcd4bce5e58987c8c039bdf7705a22cd229fe96 h: refs/heads/master i:   37159:
 47972181c1b28d5809f45545eb039cdf34ab1599 v: v3

---
 [refs]                           |  2 +-
 trunk/fs/xfs/linux-2.6/xfs_lrw.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d7ef4aa73f6a..8a464f8f9557 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 215101c36012399cf2eaee849de54eeefc9f618c
+refs/heads/master: edcd4bce5e58987c8c039bdf7705a22cd229fe96
diff --git a/trunk/fs/xfs/linux-2.6/xfs_lrw.c b/trunk/fs/xfs/linux-2.6/xfs_lrw.c
index ee788b1cb364..55992b40353c 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_lrw.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_lrw.c
@@ -270,12 +270,12 @@ xfs_read(
 		}
 	}
 
-	if (unlikely((ioflags & IO_ISDIRECT) && VN_CACHED(vp)))
-		bhv_vop_flushinval_pages(vp, ctooff(offtoct(*offset)),
-						-1, FI_REMAPF_LOCKED);
-
-	if (unlikely(ioflags & IO_ISDIRECT))
+	if (unlikely(ioflags & IO_ISDIRECT)) {
+		if (VN_CACHED(vp))
+			bhv_vop_flushinval_pages(vp, ctooff(offtoct(*offset)),
+						 -1, FI_REMAPF_LOCKED);
 		mutex_unlock(&inode->i_mutex);
+	}
 
 	xfs_rw_enter_trace(XFS_READ_ENTER, &ip->i_iocore,
 				(void *)iovp, segs, *offset, ioflags);