Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / fs / xfs / xfs_dfrag.c

diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c
index 63abdc2ac7f4ba0da434c45e32f08a8e6be5209a..681be5c93af500f63fc2cd4e744682023b6c7497 100644 (file)
--- a/fs/xfs/xfs_dfrag.c
+++ b/fs/xfs/xfs_dfrag.c
@@ -180,9 +180,10 @@ xfs_swapext(
                goto error0;
        }
 
-       if (VN_CACHED(tvp) != 0)
-               xfs_inval_cached_pages(XFS_ITOV(tip), &(tip->i_iocore),
-                                               (xfs_off_t)0, 0, 0);
+       if (VN_CACHED(tvp) != 0) {
+               xfs_inval_cached_trace(&tip->i_iocore, 0, -1, 0, -1);
+               VOP_FLUSHINVAL_PAGES(tvp, 0, -1, FI_REMAPF_LOCKED);
+       }
 
        /* Verify O_DIRECT for ftmp */
        if (VN_CACHED(tvp) != 0) {