[XFS] Minor cleanup from dio locking fix, remove an extra conditional.

SGI-PV: 955696
SGI-Modid: xfs-linux-melb:xfs-kern:26908a

Signed-off-by: Nathan Scott <nathans@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

fs/xfs/linux-2.6/xfs_lrw.c

@@ -270,12 +270,12 @@ xfs_read(
 		}
 	}
 
-	if (unlikely((ioflags & IO_ISDIRECT) && VN_CACHED(vp)))
+	if (unlikely(ioflags & IO_ISDIRECT)) {
-		bhv_vop_flushinval_pages(vp, ctooff(offtoct(*offset)),
+		if (VN_CACHED(vp))
-						-1, FI_REMAPF_LOCKED);
+			bhv_vop_flushinval_pages(vp, ctooff(offtoct(*offset)),
-
+						 -1, FI_REMAPF_LOCKED);
-	if (unlikely(ioflags & IO_ISDIRECT))
 		mutex_unlock(&inode->i_mutex);
+	}
 
 	xfs_rw_enter_trace(XFS_READ_ENTER, &ip->i_iocore,
 				(void *)iovp, segs, *offset, ioflags);