auto merge with /home/aegl/GIT/linus

[~andy/linux] / fs / xfs / xfs_dfrag.c

diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c
index 08d551a173478da6dd21b37238b2f5fb1ec88ee6..63abdc2ac7f4ba0da434c45e32f08a8e6be5209a 100644 (file)
--- a/fs/xfs/xfs_dfrag.c
+++ b/fs/xfs/xfs_dfrag.c
@@ -182,7 +182,7 @@ xfs_swapext(
 
        if (VN_CACHED(tvp) != 0)
                xfs_inval_cached_pages(XFS_ITOV(tip), &(tip->i_iocore),
-                                               (loff_t)0, 0, 0);
+                                               (xfs_off_t)0, 0, 0);
 
        /* Verify O_DIRECT for ftmp */
        if (VN_CACHED(tvp) != 0) {