Commit edcd4bce authored by Nathan Scott's avatar Nathan Scott Committed by Tim Shimmin

[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: default avatarNathan Scott <nathans@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 215101c3
...@@ -270,12 +270,12 @@ xfs_read( ...@@ -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); mutex_unlock(&inode->i_mutex);
}
xfs_rw_enter_trace(XFS_READ_ENTER, &ip->i_iocore, xfs_rw_enter_trace(XFS_READ_ENTER, &ip->i_iocore,
(void *)iovp, segs, *offset, ioflags); (void *)iovp, segs, *offset, ioflags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment