diff options
Diffstat (limited to 'fs/xfs/xfs_acl.c')
-rw-r--r-- | fs/xfs/xfs_acl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 8c300da4e7ab..e1074955386f 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c | |||
@@ -241,7 +241,7 @@ xfs_acl_vget( | |||
241 | goto out; | 241 | goto out; |
242 | } | 242 | } |
243 | if (kind == _ACL_TYPE_ACCESS) { | 243 | if (kind == _ACL_TYPE_ACCESS) { |
244 | vattr_t va; | 244 | bhv_vattr_t va; |
245 | 245 | ||
246 | va.va_mask = XFS_AT_MODE; | 246 | va.va_mask = XFS_AT_MODE; |
247 | error = bhv_vop_getattr(vp, &va, 0, sys_cred); | 247 | error = bhv_vop_getattr(vp, &va, 0, sys_cred); |
@@ -373,7 +373,7 @@ xfs_acl_allow_set( | |||
373 | bhv_vnode_t *vp, | 373 | bhv_vnode_t *vp, |
374 | int kind) | 374 | int kind) |
375 | { | 375 | { |
376 | vattr_t va; | 376 | bhv_vattr_t va; |
377 | int error; | 377 | int error; |
378 | 378 | ||
379 | if (vp->v_inode.i_flags & (S_IMMUTABLE|S_APPEND)) | 379 | if (vp->v_inode.i_flags & (S_IMMUTABLE|S_APPEND)) |
@@ -666,7 +666,7 @@ xfs_acl_vtoacl( | |||
666 | xfs_acl_t *access_acl, | 666 | xfs_acl_t *access_acl, |
667 | xfs_acl_t *default_acl) | 667 | xfs_acl_t *default_acl) |
668 | { | 668 | { |
669 | vattr_t va; | 669 | bhv_vattr_t va; |
670 | int error = 0; | 670 | int error = 0; |
671 | 671 | ||
672 | if (access_acl) { | 672 | if (access_acl) { |
@@ -702,7 +702,7 @@ xfs_acl_vtoacl( | |||
702 | int | 702 | int |
703 | xfs_acl_inherit( | 703 | xfs_acl_inherit( |
704 | bhv_vnode_t *vp, | 704 | bhv_vnode_t *vp, |
705 | vattr_t *vap, | 705 | bhv_vattr_t *vap, |
706 | xfs_acl_t *pdaclp) | 706 | xfs_acl_t *pdaclp) |
707 | { | 707 | { |
708 | xfs_acl_t *cacl; | 708 | xfs_acl_t *cacl; |
@@ -761,7 +761,7 @@ xfs_acl_setmode( | |||
761 | xfs_acl_t *acl, | 761 | xfs_acl_t *acl, |
762 | int *basicperms) | 762 | int *basicperms) |
763 | { | 763 | { |
764 | vattr_t va; | 764 | bhv_vattr_t va; |
765 | xfs_acl_entry_t *ap; | 765 | xfs_acl_entry_t *ap; |
766 | xfs_acl_entry_t *gap = NULL; | 766 | xfs_acl_entry_t *gap = NULL; |
767 | int i, error, nomask = 1; | 767 | int i, error, nomask = 1; |