summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_acl.h
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-06-09 17:07:12 +1000
committerNathan Scott <nathans@sgi.com>2006-06-09 17:07:12 +1000
commit8285fb58e75bfdb447c7a2c533ec9efdb238f966 (patch)
tree4bcfa74d3328ff5d71437556d24019be98c1d9fa /fs/xfs/xfs_acl.h
parent67fcaa73adafb19139a7cd8ab133592b6a0a0901 (diff)
downloadlinux-8285fb58e75bfdb447c7a2c533ec9efdb238f966.tar.bz2
[XFS] Resolve a namespace collision on remaining vtypes for FreeBSD
porters. SGI-PV: 953338 SGI-Modid: xfs-linux-melb:xfs-kern:26108a Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_acl.h')
-rw-r--r--fs/xfs/xfs_acl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_acl.h b/fs/xfs/xfs_acl.h
index a57ff4e6d39a..f853cf1a6270 100644
--- a/fs/xfs/xfs_acl.h
+++ b/fs/xfs/xfs_acl.h
@@ -58,7 +58,7 @@ extern struct kmem_zone *xfs_acl_zone;
(zone) = kmem_zone_init(sizeof(xfs_acl_t), (name))
#define xfs_acl_zone_destroy(zone) kmem_zone_destroy(zone)
-extern int xfs_acl_inherit(struct bhv_vnode *, struct vattr *, xfs_acl_t *);
+extern int xfs_acl_inherit(struct bhv_vnode *, struct bhv_vattr *, xfs_acl_t *);
extern int xfs_acl_iaccess(struct xfs_inode *, mode_t, cred_t *);
extern int xfs_acl_vtoacl(struct bhv_vnode *, xfs_acl_t *, xfs_acl_t *);
extern int xfs_acl_vhasacl_access(struct bhv_vnode *);