Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6: (59 commits)
  [XFS] eagerly remove vmap mappings to avoid upsetting Xen
  [XFS] simplify validata_fields
  [XFS] no longer using io_vnode, as was remaining from 23 cherrypick
  [XFS] Remove STATIC which was missing from prior manual merge
  [XFS] Put back the QUEUE_ORDERED_NONE test in the barrier check.
  [XFS] Turn off XBF_ASYNC flag before re-reading superblock.
  [XFS] avoid race in sync_inodes() that can fail to write out all dirty data
  [XFS] This fix prevents bulkstat from spinning in an infinite loop.
  [XFS] simplify xfs_create/mknod/symlink prototype
  [XFS] avoid xfs_getattr in XFS_IOC_FSGETXATTR ioctl
  [XFS] get_bulkall() could return incorrect inode state
  [XFS] Kill unused IOMAP_EOF flag
  [XFS] fix when DMAPI mount option processing happens
  [XFS] ensure file size is logged on synchronous writes
  [XFS] growlock should be a mutex
  [XFS] replace some large xfs_log_priv.h macros by proper functions
  [XFS] kill struct bhv_vfs
  [XFS] move syncing related members from struct bhv_vfs to struct xfs_mount
  [XFS] kill the vfs_flags member in struct bhv_vfs
  [XFS] kill the vfs_fsid and vfs_altfsid members in struct bhv_vfs
  ...

1 files changed, 31 insertions, 19 deletions

diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index 7ce44a7b88a2..93fa64dd1be6 100644
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -49,6 +49,7 @@
 #include "xfs_trans_space.h"
 #include "xfs_acl.h"
 #include "xfs_rw.h"
+#include "xfs_vnodeops.h"
 
 /*
  * xfs_attr.c
@@ -156,10 +157,14 @@ xfs_attr_fetch(xfs_inode_t *ip, const char *name, int namelen,
 }
 
 int
-xfs_attr_get(bhv_desc_t *bdp, const char *name, char *value, int *valuelenp,
-             int flags, struct cred *cred)
+xfs_attr_get(
+        xfs_inode_t     *ip,
+        const char      *name,
+        char            *value,
+        int             *valuelenp,
+        int             flags,
+        cred_t          *cred)
 {
-        xfs_inode_t     *ip = XFS_BHVTOI(bdp);
         int             error, namelen;
 
         XFS_STATS_INC(xs_attr_get);
@@ -417,10 +422,13 @@ out:
 }
 
 int
-xfs_attr_set(bhv_desc_t *bdp, const char *name, char *value, int valuelen, int flags,
-             struct cred *cred)
+xfs_attr_set(
+        xfs_inode_t     *dp,
+        const char      *name,
+        char            *value,
+        int             valuelen,
+        int             flags)
 {
-        xfs_inode_t     *dp;
         int             namelen;
 
         namelen = strlen(name);
@@ -429,7 +437,6 @@ xfs_attr_set(bhv_desc_t *bdp, const char *name, char *value, int valuelen, int f
 
         XFS_STATS_INC(xs_attr_set);
 
-        dp = XFS_BHVTOI(bdp);
         if (XFS_FORCED_SHUTDOWN(dp->i_mount))
                 return (EIO);
 
@@ -563,10 +570,12 @@ out:
 }
 
 int
-xfs_attr_remove(bhv_desc_t *bdp, const char *name, int flags, struct cred *cred)
+xfs_attr_remove(
+        xfs_inode_t     *dp,
+        const char      *name,
+        int             flags)
 {
-        xfs_inode_t         *dp;
-        int                 namelen;
+        int             namelen;
 
         namelen = strlen(name);
         if (namelen >= MAXNAMELEN)
@@ -574,7 +583,6 @@ xfs_attr_remove(bhv_desc_t *bdp, const char *name, int flags, struct cred *cred)
 
         XFS_STATS_INC(xs_attr_remove);
 
-        dp = XFS_BHVTOI(bdp);
         if (XFS_FORCED_SHUTDOWN(dp->i_mount))
                 return (EIO);
 
@@ -702,11 +710,14 @@ xfs_attr_kern_list_sizes(xfs_attr_list_context_t *context, attrnames_t *namesp,
  * success.
  */
 int
-xfs_attr_list(bhv_desc_t *bdp, char *buffer, int bufsize, int flags,
-                      attrlist_cursor_kern_t *cursor, struct cred *cred)
+xfs_attr_list(
+        xfs_inode_t     *dp,
+        char            *buffer,
+        int             bufsize,
+        int             flags,
+        attrlist_cursor_kern_t *cursor)
 {
         xfs_attr_list_context_t context;
-        xfs_inode_t *dp;
         int error;
 
         XFS_STATS_INC(xs_attr_list);
@@ -731,7 +742,7 @@ xfs_attr_list(bhv_desc_t *bdp, char *buffer, int bufsize, int flags,
         /*
          * Initialize the output buffer.
          */
-        context.dp = dp = XFS_BHVTOI(bdp);
+        context.dp = dp;
         context.cursor = cursor;
         context.count = 0;
         context.dupcnt = 0;
@@ -2502,7 +2513,7 @@ STATIC int
 attr_generic_set(
         bhv_vnode_t *vp, char *name, void *data, size_t size, int xflags)
 {
-        return -bhv_vop_attr_set(vp, name, data, size, xflags, NULL);
+        return -xfs_attr_set(xfs_vtoi(vp), name, data, size, xflags);
 }
 
 STATIC int
@@ -2511,7 +2522,8 @@ attr_generic_get(
 {
         int     error, asize = size;
 
-        error = bhv_vop_attr_get(vp, name, data, &asize, xflags, NULL);
+        error = xfs_attr_get(xfs_vtoi(vp), name, data,
+                                    &asize, xflags, NULL);
         if (!error)
                 return asize;
         return -error;
@@ -2521,7 +2533,7 @@ STATIC int
 attr_generic_remove(
         bhv_vnode_t *vp, char *name, int xflags)
 {
-        return -bhv_vop_attr_remove(vp, name, xflags, NULL);
+        return -xfs_attr_remove(xfs_vtoi(vp), name, xflags);
 }
 
 STATIC int
@@ -2576,7 +2588,7 @@ attr_generic_list(
         attrlist_cursor_kern_t  cursor = { 0 };
         int                     error;
 
-        error = bhv_vop_attr_list(vp, data, size, xflags, &cursor, NULL);
+        error = xfs_attr_list(xfs_vtoi(vp), data, size, xflags, &cursor);
         if (error > 0)
                 return -error;
         *result = -error;