linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / xfs / xfs_acl.c

diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c
index 4b0cb47..4ff0f4e 100644 (file)
--- a/fs/xfs/xfs_acl.c
+++ b/fs/xfs/xfs_acl.c
@@ -21,10 +21,12 @@
 #include "xfs_bit.h"
 #include "xfs_inum.h"
 #include "xfs_ag.h"
+#include "xfs_dir.h"
 #include "xfs_dir2.h"
 #include "xfs_bmap_btree.h"
 #include "xfs_alloc_btree.h"
 #include "xfs_ialloc_btree.h"
+#include "xfs_dir_sf.h"
 #include "xfs_dir2_sf.h"
 #include "xfs_attr_sf.h"
 #include "xfs_dinode.h"
@@ -37,15 +39,15 @@
 #include <linux/capability.h>
 #include <linux/posix_acl_xattr.h>
 
-STATIC int     xfs_acl_setmode(bhv_vnode_t *, xfs_acl_t *, int *);
+STATIC int     xfs_acl_setmode(vnode_t *, xfs_acl_t *, int *);
 STATIC void     xfs_acl_filter_mode(mode_t, xfs_acl_t *);
 STATIC void    xfs_acl_get_endian(xfs_acl_t *);
 STATIC int     xfs_acl_access(uid_t, gid_t, xfs_acl_t *, mode_t, cred_t *);
 STATIC int     xfs_acl_invalid(xfs_acl_t *);
 STATIC void    xfs_acl_sync_mode(mode_t, xfs_acl_t *);
-STATIC void    xfs_acl_get_attr(bhv_vnode_t *, xfs_acl_t *, int, int, int *);
-STATIC void    xfs_acl_set_attr(bhv_vnode_t *, xfs_acl_t *, int, int *);
-STATIC int     xfs_acl_allow_set(bhv_vnode_t *, int);
+STATIC void    xfs_acl_get_attr(vnode_t *, xfs_acl_t *, int, int, int *);
+STATIC void    xfs_acl_set_attr(vnode_t *, xfs_acl_t *, int, int *);
+STATIC int     xfs_acl_allow_set(vnode_t *, int);
 
 kmem_zone_t *xfs_acl_zone;
 
@@ -55,7 +57,7 @@ kmem_zone_t *xfs_acl_zone;
  */
 int
 xfs_acl_vhasacl_access(
-       bhv_vnode_t     *vp)
+       vnode_t         *vp)
 {
        int             error;
 
@@ -68,7 +70,7 @@ xfs_acl_vhasacl_access(
  */
 int
 xfs_acl_vhasacl_default(
-       bhv_vnode_t     *vp)
+       vnode_t         *vp)
 {
        int             error;
 
@@ -207,7 +209,7 @@ posix_acl_xfs_to_xattr(
 
 int
 xfs_acl_vget(
-       bhv_vnode_t     *vp,
+       vnode_t         *vp,
        void            *acl,
        size_t          size,
        int             kind)
@@ -239,10 +241,10 @@ xfs_acl_vget(
                        goto out;
                }
                if (kind == _ACL_TYPE_ACCESS) {
-                       bhv_vattr_t     va;
+                       vattr_t va;
 
                        va.va_mask = XFS_AT_MODE;
-                       error = bhv_vop_getattr(vp, &va, 0, sys_cred);
+                       VOP_GETATTR(vp, &va, 0, sys_cred, error);
                        if (error)
                                goto out;
                        xfs_acl_sync_mode(va.va_mode, xfs_acl);
@@ -258,7 +260,7 @@ out:
 
 int
 xfs_acl_vremove(
-       bhv_vnode_t     *vp,
+       vnode_t         *vp,
        int             kind)
 {
        int             error;
@@ -266,9 +268,9 @@ xfs_acl_vremove(
        VN_HOLD(vp);
        error = xfs_acl_allow_set(vp, kind);
        if (!error) {
-               error = bhv_vop_attr_remove(vp, kind == _ACL_TYPE_DEFAULT?
-                                               SGI_ACL_DEFAULT: SGI_ACL_FILE,
-                                               ATTR_ROOT, sys_cred);
+               VOP_ATTR_REMOVE(vp, kind == _ACL_TYPE_DEFAULT?
+                               SGI_ACL_DEFAULT: SGI_ACL_FILE,
+                               ATTR_ROOT, sys_cred, error);
                if (error == ENOATTR)
                        error = 0;      /* 'scool */
        }
@@ -278,7 +280,7 @@ xfs_acl_vremove(
 
 int
 xfs_acl_vset(
-       bhv_vnode_t             *vp,
+       vnode_t                 *vp,
        void                    *acl,
        size_t                  size,
        int                     kind)
@@ -368,10 +370,10 @@ xfs_acl_iaccess(
 
 STATIC int
 xfs_acl_allow_set(
-       bhv_vnode_t     *vp,
+       vnode_t         *vp,
        int             kind)
 {
-       bhv_vattr_t     va;
+       vattr_t         va;
        int             error;
 
        if (vp->v_inode.i_flags & (S_IMMUTABLE|S_APPEND))
@@ -381,7 +383,7 @@ xfs_acl_allow_set(
        if (vp->v_vfsp->vfs_flag & VFS_RDONLY)
                return EROFS;
        va.va_mask = XFS_AT_UID;
-       error = bhv_vop_getattr(vp, &va, 0, NULL);
+       VOP_GETATTR(vp, &va, 0, NULL, error);
        if (error)
                return error;
        if (va.va_uid != current->fsuid && !capable(CAP_FOWNER))
@@ -393,7 +395,7 @@ xfs_acl_allow_set(
  * The access control process to determine the access permission:
  *     if uid == file owner id, use the file owner bits.
  *     if gid == file owner group id, use the file group bits.
- *     scan ACL for a matching user or group, and use matched entry
+ *     scan ACL for a maching user or group, and use matched entry
  *     permission. Use total permissions of all matching group entries,
  *     until all acl entries are exhausted. The final permission produced
  *     by matching acl entry or entries needs to be & with group permission.
@@ -604,7 +606,7 @@ xfs_acl_get_endian(
  */
 STATIC void
 xfs_acl_get_attr(
-       bhv_vnode_t     *vp,
+       vnode_t         *vp,
        xfs_acl_t       *aclp,
        int             kind,
        int             flags,
@@ -614,9 +616,9 @@ xfs_acl_get_attr(
 
        ASSERT((flags & ATTR_KERNOVAL) ? (aclp == NULL) : 1);
        flags |= ATTR_ROOT;
-       *error = bhv_vop_attr_get(vp, kind == _ACL_TYPE_ACCESS ?
-                                       SGI_ACL_FILE : SGI_ACL_DEFAULT,
-                                       (char *)aclp, &len, flags, sys_cred);
+       VOP_ATTR_GET(vp,
+               kind == _ACL_TYPE_ACCESS ? SGI_ACL_FILE : SGI_ACL_DEFAULT,
+               (char *)aclp, &len, flags, sys_cred, *error);
        if (*error || (flags & ATTR_KERNOVAL))
                return;
        xfs_acl_get_endian(aclp);
@@ -627,7 +629,7 @@ xfs_acl_get_attr(
  */
 STATIC void
 xfs_acl_set_attr(
-       bhv_vnode_t     *vp,
+       vnode_t         *vp,
        xfs_acl_t       *aclp,
        int             kind,
        int             *error)
@@ -652,19 +654,19 @@ xfs_acl_set_attr(
                INT_SET(newace->ae_perm, ARCH_CONVERT, ace->ae_perm);
        }
        INT_SET(newacl->acl_cnt, ARCH_CONVERT, aclp->acl_cnt);
-       *error = bhv_vop_attr_set(vp, kind == _ACL_TYPE_ACCESS ?
-                               SGI_ACL_FILE: SGI_ACL_DEFAULT,
-                               (char *)newacl, len, ATTR_ROOT, sys_cred);
+       VOP_ATTR_SET(vp,
+               kind == _ACL_TYPE_ACCESS ? SGI_ACL_FILE: SGI_ACL_DEFAULT,
+               (char *)newacl, len, ATTR_ROOT, sys_cred, *error);
        _ACL_FREE(newacl);
 }
 
 int
 xfs_acl_vtoacl(
-       bhv_vnode_t     *vp,
+       vnode_t         *vp,
        xfs_acl_t       *access_acl,
        xfs_acl_t       *default_acl)
 {
-       bhv_vattr_t     va;
+       vattr_t         va;
        int             error = 0;
 
        if (access_acl) {
@@ -676,7 +678,7 @@ xfs_acl_vtoacl(
                if (!error) {
                        /* Got the ACL, need the mode... */
                        va.va_mask = XFS_AT_MODE;
-                       error = bhv_vop_getattr(vp, &va, 0, sys_cred);
+                       VOP_GETATTR(vp, &va, 0, sys_cred, error);
                }
 
                if (error)
@@ -699,8 +701,8 @@ xfs_acl_vtoacl(
  */
 int
 xfs_acl_inherit(
-       bhv_vnode_t     *vp,
-       bhv_vattr_t     *vap,
+       vnode_t         *vp,
+       vattr_t         *vap,
        xfs_acl_t       *pdaclp)
 {
        xfs_acl_t       *cacl;
@@ -755,11 +757,11 @@ xfs_acl_inherit(
  */
 STATIC int
 xfs_acl_setmode(
-       bhv_vnode_t     *vp,
+       vnode_t         *vp,
        xfs_acl_t       *acl,
        int             *basicperms)
 {
-       bhv_vattr_t     va;
+       vattr_t         va;
        xfs_acl_entry_t *ap;
        xfs_acl_entry_t *gap = NULL;
        int             i, error, nomask = 1;
@@ -774,7 +776,7 @@ xfs_acl_setmode(
         * mode.  The m:: bits take precedence over the g:: bits.
         */
        va.va_mask = XFS_AT_MODE;
-       error = bhv_vop_getattr(vp, &va, 0, sys_cred);
+       VOP_GETATTR(vp, &va, 0, sys_cred, error);
        if (error)
                return error;
 
@@ -808,7 +810,8 @@ xfs_acl_setmode(
        if (gap && nomask)
                va.va_mode |= gap->ae_perm << 3;
 
-       return bhv_vop_setattr(vp, &va, 0, sys_cred);
+       VOP_SETATTR(vp, &va, 0, sys_cred, error);
+       return error;
 }
 
 /*