diff options
| author | Torsten Kaiser | 2013-01-20 10:24:49 +0100 |
|---|---|---|
| committer | Ben Myers | 2013-01-28 23:05:10 +0100 |
| commit | 65e3aa77f1b0269720660a6879f6f28d158f54c8 (patch) | |
| tree | 26c9e4f499c65f96b07ff5c30e3c809d0c193b22 /fs/xfs/xfs_dfrag.c | |
| parent | xfs: Fix possible use-after-free with AIO (diff) | |
| download | kernel-qcow2-linux-65e3aa77f1b0269720660a6879f6f28d158f54c8.tar.gz kernel-qcow2-linux-65e3aa77f1b0269720660a6879f6f28d158f54c8.tar.xz kernel-qcow2-linux-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/xfs/xfs_dfrag.c')
| -rw-r--r-- | fs/xfs/xfs_dfrag.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c index d0e9c74d3d96..a8bd26b82ecb 100644 --- a/fs/xfs/xfs_dfrag.c +++ b/fs/xfs/xfs_dfrag.c @@ -246,10 +246,10 @@ xfs_swap_extents( goto out_unlock; } - error = -filemap_write_and_wait(VFS_I(ip)->i_mapping); + error = -filemap_write_and_wait(VFS_I(tip)->i_mapping); if (error) goto out_unlock; - truncate_pagecache_range(VFS_I(ip), 0, -1); + truncate_pagecache_range(VFS_I(tip), 0, -1); /* Verify O_DIRECT for ftmp */ if (VN_CACHED(VFS_I(tip)) != 0) { |