2007-01-23 22:39:11

by David Chinner

[permalink] [raw]
Subject: [PATCH 2/2]: Fix BUG in cancel_dirty_pages on XFS

Make XFS use the new truncate_unmap_inode_pages_range()
function.

Signed-off-by: Dave Chinner <[email protected]>

---
fs/xfs/linux-2.6/xfs_fs_subr.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

Index: 2.6.x-xfs-new/fs/xfs/linux-2.6/xfs_fs_subr.c
===================================================================
--- 2.6.x-xfs-new.orig/fs/xfs/linux-2.6/xfs_fs_subr.c 2007-01-23 18:42:46.000000000 +1100
+++ 2.6.x-xfs-new/fs/xfs/linux-2.6/xfs_fs_subr.c 2007-01-23 18:44:53.955160806 +1100
@@ -32,7 +32,8 @@ fs_tosspages(
struct inode *ip = vn_to_inode(vp);

if (VN_CACHED(vp))
- truncate_inode_pages(ip->i_mapping, first);
+ truncate_unmap_inode_pages_range(ip->i_mapping,
+ first, last, 1);
}

void
@@ -49,7 +50,8 @@ fs_flushinval_pages(
if (VN_TRUNC(vp))
VUNTRUNCATE(vp);
filemap_write_and_wait(ip->i_mapping);
- truncate_inode_pages(ip->i_mapping, first);
+ truncate_unmap_inode_pages_range(ip->i_mapping,
+ first, last, 1);
}
}