Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / 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 575f2a790f315e9ff84530ea39d4659c1135756e..1eefe61f0e10baa80a68c416b7e4f92dba816538 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_fs_subr.c
+++ b/fs/xfs/linux-2.6/xfs_fs_subr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
+ * Copyright (c) 2000-2002,2005-2006 Silicon Graphics, Inc.
  * All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -15,97 +15,67 @@
  * along with this program; if not, write the Free Software Foundation,
  * 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"
 
-/*
- * Stub for no-op vnode operations that return error status.
- */
-int
-fs_noerr(void)
-{
-       return 0;
-}
+int  fs_noerr(void) { return 0; }
+int  fs_nosys(void) { return ENOSYS; }
+void fs_noval(void) { return; }
 
-/*
- * Operation unsupported under this file system.
- */
-int
-fs_nosys(void)
-{
-       return ENOSYS;
-}
-
-/*
- * Stub for inactive, strategy, and read/write lock/unlock.  Does nothing.
- */
-/* ARGSUSED */
 void
-fs_noval(void)
-{
-}
-
-/*
- * vnode pcache layer for vnode_tosspages.
- * 'last' parameter unused but left in for IRIX compatibility
- */
-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 = ip->i_vnode->i_mapping;
 
-       if (VN_CACHED(vp))
-               truncate_inode_pages(ip->i_mapping, first);
+       if (mapping->nrpages)
+               truncate_inode_pages(mapping, first);
 }
 
-
-/*
- * vnode pcache layer for vnode_flushinval_pages.
- * 'last' parameter unused but left in for IRIX compatibility
- */
-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);
-
-       if (VN_CACHED(vp)) {
-               filemap_write_and_wait(ip->i_mapping);
+       struct address_space *mapping = ip->i_vnode->i_mapping;
+       int             ret = 0;
 
-               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;
 }
 
-/*
- * vnode pcache layer for vnode_flush_pages.
- * 'last' parameter unused but left in for IRIX compatibility
- */
 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 = ip->i_vnode->i_mapping;
+       int             ret = 0;
+       int             ret2;
 
-       if (VN_CACHED(vp)) {
-               filemap_fdatawrite(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 0;
-               filemap_fdatawait(ip->i_mapping);
+                       return ret;
+               ret2 = filemap_fdatawait(mapping);
+               if (!ret)
+                       ret = ret2;
        }
-
-       return 0;
+       return ret;
 }