aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTorsten Kaiser2013-01-20 03:24:49 -0600
committerBen Myers2013-01-28 16:05:10 -0600
commit65e3aa77f1b0269720660a6879f6f28d158f54c8 (patch)
tree26c9e4f499c65f96b07ff5c30e3c809d0c193b22 /fs
parent4b05d09c18d9aa62d2e7fb4b057f54e5a38963f5 (diff)
downloadkernel-common-65e3aa77f1b0269720660a6879f6f28d158f54c8.tar.gz
kernel-common-65e3aa77f1b0269720660a6879f6f28d158f54c8.tar.xz
kernel-common-65e3aa77f1b0269720660a6879f6f28d158f54c8.zip
xfs: Fix xfs_swap_extents() after removal of xfs_flushinval_pages()
Commit fb59581404ab7ec5075299065c22cb211a9262a9 removed xfs_flushinval_pages() and changed its callers to use filemap_write_and_wait() and truncate_pagecache_range() directly. But in xfs_swap_extents() this change accidental switched the argument for 'tip' to 'ip'. This patch switches it back to 'tip' Signed-off-by: Torsten Kaiser <just.for.lkml@googlemail.com> Reviewed-by: Ben Myers <bpm@sgi.com> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_dfrag.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c
index d0e9c74d3d9..a8bd26b82ec 100644
--- a/fs/xfs/xfs_dfrag.c
+++ b/fs/xfs/xfs_dfrag.c
@@ -246,10 +246,10 @@ xfs_swap_extents(
246 goto out_unlock; 246 goto out_unlock;
247 } 247 }
248 248
249 error = -filemap_write_and_wait(VFS_I(ip)->i_mapping); 249 error = -filemap_write_and_wait(VFS_I(tip)->i_mapping);
250 if (error) 250 if (error)
251 goto out_unlock; 251 goto out_unlock;
252 truncate_pagecache_range(VFS_I(ip), 0, -1); 252 truncate_pagecache_range(VFS_I(tip), 0, -1);
253 253
254 /* Verify O_DIRECT for ftmp */ 254 /* Verify O_DIRECT for ftmp */
255 if (VN_CACHED(VFS_I(tip)) != 0) { 255 if (VN_CACHED(VFS_I(tip)) != 0) {