diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-09-28 11:05:33 +1000 |
|---|---|---|
| committer | Tim Shimmin <tes@sgi.com> | 2006-09-28 11:05:33 +1000 |
| commit | edcd4bce5e58987c8c039bdf7705a22cd229fe96 (patch) | |
| tree | 208d7420365a9a6f6a0f33a19ae92db205c966b3 /fs/xfs | |
| parent | 215101c36012399cf2eaee849de54eeefc9f618c (diff) | |
| download | linux-edcd4bce5e58987c8c039bdf7705a22cd229fe96.tar.gz linux-edcd4bce5e58987c8c039bdf7705a22cd229fe96.tar.bz2 linux-edcd4bce5e58987c8c039bdf7705a22cd229fe96.zip | |
[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>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_lrw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c index ee788b1cb364..55992b40353c 100644 --- a/fs/xfs/linux-2.6/xfs_lrw.c +++ b/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); |