diff options
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_lrw.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_lrw.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c index 2dc979e3e969..fb04b11bb815 100644 --- a/fs/xfs/linux-2.6/xfs_lrw.c +++ b/fs/xfs/linux-2.6/xfs_lrw.c | |||
@@ -257,8 +257,9 @@ xfs_read( | |||
257 | 257 | ||
258 | if (unlikely(ioflags & IO_ISDIRECT)) { | 258 | if (unlikely(ioflags & IO_ISDIRECT)) { |
259 | if (VN_CACHED(vp)) | 259 | if (VN_CACHED(vp)) |
260 | ret = bhv_vop_flushinval_pages(vp, ctooff(offtoct(*offset)), | 260 | ret = xfs_flushinval_pages(ip, |
261 | -1, FI_REMAPF_LOCKED); | 261 | ctooff(offtoct(*offset)), |
262 | -1, FI_REMAPF_LOCKED); | ||
262 | mutex_unlock(&inode->i_mutex); | 263 | mutex_unlock(&inode->i_mutex); |
263 | if (ret) { | 264 | if (ret) { |
264 | xfs_iunlock(ip, XFS_IOLOCK_SHARED); | 265 | xfs_iunlock(ip, XFS_IOLOCK_SHARED); |
@@ -752,7 +753,8 @@ retry: | |||
752 | WARN_ON(need_i_mutex == 0); | 753 | WARN_ON(need_i_mutex == 0); |
753 | xfs_inval_cached_trace(io, pos, -1, | 754 | xfs_inval_cached_trace(io, pos, -1, |
754 | ctooff(offtoct(pos)), -1); | 755 | ctooff(offtoct(pos)), -1); |
755 | error = bhv_vop_flushinval_pages(vp, ctooff(offtoct(pos)), | 756 | error = xfs_flushinval_pages(xip, |
757 | ctooff(offtoct(pos)), | ||
756 | -1, FI_REMAPF_LOCKED); | 758 | -1, FI_REMAPF_LOCKED); |
757 | if (error) | 759 | if (error) |
758 | goto out_unlock_internal; | 760 | goto out_unlock_internal; |