1 files changed, 20 insertions, 3 deletions

diff --git a/fs/xfs/linux-2.6/xfs_fs_subr.c b/fs/xfs/linux-2.6/xfs_fs_subr.c
index 36caa6d957df..5aeb77776961 100644
--- a/fs/xfs/linux-2.6/xfs_fs_subr.c
+++ b/fs/xfs/linux-2.6/xfs_fs_subr.c
@@ -24,6 +24,10 @@ int  fs_noerr(void) { return 0; }
 int  fs_nosys(void) { return ENOSYS; }
 void fs_noval(void) { return; }
 
+/*
+ * note: all filemap functions return negative error codes. These
+ * need to be inverted before returning to the xfs core functions.
+ */
 void
 xfs_tosspages(
         xfs_inode_t     *ip,
@@ -53,7 +57,7 @@ xfs_flushinval_pages(
                 if (!ret)
                         truncate_inode_pages(mapping, first);
         }
-        return ret;
+        return -ret;
 }
 
 int
@@ -72,10 +76,23 @@ xfs_flush_pages(
                 xfs_iflags_clear(ip, XFS_ITRUNCATED);
                 ret = filemap_fdatawrite(mapping);
                 if (flags & XFS_B_ASYNC)
-                        return ret;
+                        return -ret;
                 ret2 = filemap_fdatawait(mapping);
                 if (!ret)
                         ret = ret2;
         }
-        return ret;
+        return -ret;
+}
+
+int
+xfs_wait_on_pages(
+        xfs_inode_t     *ip,
+        xfs_off_t       first,
+        xfs_off_t       last)
+{
+        struct address_space *mapping = VFS_I(ip)->i_mapping;
+
+        if (mapping_tagged(mapping, PAGECACHE_TAG_WRITEBACK))
+                return -filemap_fdatawait(mapping);
+        return 0;
 }