SUNRPC: Ensure that sunrpc gets initialised before nfs, lockd, etc...

[safe/jmp/linux-2.6] / fs / xfs / linux-2.6 / xfs_fs_subr.c

diff --git a/fs/xfs/linux-2.6/xfs_fs_subr.c b/fs/xfs/linux-2.6/xfs_fs_subr.c
index f0c56da..08be36d 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_fs_subr.c
+++ b/fs/xfs/linux-2.6/xfs_fs_subr.c
@@ -16,61 +16,83 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include "xfs.h"
+#include "xfs_vnodeops.h"
+#include "xfs_bmap_btree.h"
+#include "xfs_inode.h"
 
 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
-fs_tosspages(
-       bhv_desc_t      *bdp,
+xfs_tosspages(
+       xfs_inode_t     *ip,
        xfs_off_t       first,
        xfs_off_t       last,
        int             fiopt)
 {
-       vnode_t         *vp = BHV_TO_VNODE(bdp);
-       struct inode    *ip = vn_to_inode(vp);
+       struct address_space *mapping = VFS_I(ip)->i_mapping;
 
-       if (VN_CACHED(vp))
-               truncate_inode_pages(ip->i_mapping, first);
+       if (mapping->nrpages)
+               truncate_inode_pages(mapping, first);
 }
 
-void
-fs_flushinval_pages(
-       bhv_desc_t      *bdp,
+int
+xfs_flushinval_pages(
+       xfs_inode_t     *ip,
        xfs_off_t       first,
        xfs_off_t       last,
        int             fiopt)
 {
-       vnode_t         *vp = BHV_TO_VNODE(bdp);
-       struct inode    *ip = vn_to_inode(vp);
+       struct address_space *mapping = VFS_I(ip)->i_mapping;
+       int             ret = 0;
 
-       if (VN_CACHED(vp)) {
-               if (VN_TRUNC(vp))
-                       VUNTRUNCATE(vp);
-               filemap_write_and_wait(ip->i_mapping);
-               truncate_inode_pages(ip->i_mapping, first);
+       if (mapping->nrpages) {
+               xfs_iflags_clear(ip, XFS_ITRUNCATED);
+               ret = filemap_write_and_wait(mapping);
+               if (!ret)
+                       truncate_inode_pages(mapping, first);
        }
+       return -ret;
 }
 
 int
-fs_flush_pages(
-       bhv_desc_t      *bdp,
+xfs_flush_pages(
+       xfs_inode_t     *ip,
        xfs_off_t       first,
        xfs_off_t       last,
        uint64_t        flags,
        int             fiopt)
 {
-       vnode_t         *vp = BHV_TO_VNODE(bdp);
-       struct inode    *ip = vn_to_inode(vp);
+       struct address_space *mapping = VFS_I(ip)->i_mapping;
+       int             ret = 0;
+       int             ret2;
 
-       if (VN_DIRTY(vp)) {
-               if (VN_TRUNC(vp))
-                       VUNTRUNCATE(vp);
-               filemap_fdatawrite(ip->i_mapping);
-               if (flags & XFS_B_ASYNC)
-                       return 0;
-               filemap_fdatawait(ip->i_mapping);
+       if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) {
+               xfs_iflags_clear(ip, XFS_ITRUNCATED);
+               ret = -filemap_fdatawrite(mapping);
        }
+       if (flags & XFS_B_ASYNC)
+               return ret;
+       ret2 = xfs_wait_on_pages(ip, first, last);
+       if (!ret)
+               ret = ret2;
+       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;
 }