--- fs/gfs2/acl.h

+++ fs/gfs2/acl.h

@@ -13,26 +13,12 @@

#include "incore.h"

#define GFS2_POSIX_ACL_ACCESS "posix_acl_access"

-#define GFS2_POSIX_ACL_ACCESS_LEN 16

#define GFS2_POSIX_ACL_DEFAULT "posix_acl_default"

-#define GFS2_POSIX_ACL_DEFAULT_LEN 17

+#define GFS2_ACL_MAX_ENTRIES 25

-#define GFS2_ACL_IS_ACCESS(name, len) \

- ((len) == GFS2_POSIX_ACL_ACCESS_LEN && \

- !memcmp(GFS2_POSIX_ACL_ACCESS, (name), (len)))

-

-#define GFS2_ACL_IS_DEFAULT(name, len) \

- ((len) == GFS2_POSIX_ACL_DEFAULT_LEN && \

- !memcmp(GFS2_POSIX_ACL_DEFAULT, (name), (len)))

-

-struct gfs2_ea_request;

-

-int gfs2_acl_validate_set(struct gfs2_inode *ip, int access,

- struct gfs2_ea_request *er,

- int *remove, mode_t *mode);

-int gfs2_acl_validate_remove(struct gfs2_inode *ip, int access);

-int gfs2_check_acl(struct inode *inode, int mask);

-int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip);

-int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr);

+extern int gfs2_check_acl(struct inode *inode, int mask);

+extern int gfs2_acl_create(struct gfs2_inode *dip, struct gfs2_inode *ip);

+extern int gfs2_acl_chmod(struct gfs2_inode *ip, struct iattr *attr);

+extern struct xattr_handler gfs2_xattr_system_handler;

#endif /* __ACL_DOT_H__ */