diff options
author | Andreas Gruenbacher <agruenba@redhat.com> | 2015-12-02 08:44:35 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-12-06 21:25:17 -0500 |
commit | 97d79299223baab330b194437e676d301f12d5f6 (patch) | |
tree | 7845b5fe37465c52d3a8584b4f00945617333a0d /fs/posix_acl.c | |
parent | 44cb0d3f778da6646f8e993245ee827a6b7df6d5 (diff) |
posix acls: Remove duplicate xattr name definitions
Remove POSIX_ACL_XATTR_{ACCESS,DEFAULT} and GFS2_POSIX_ACL_{ACCESS,DEFAULT}
and replace them with the definitions in <include/uapi/linux/xattr.h>.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: James Morris <james.l.morris@oracle.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/posix_acl.c')
-rw-r--r-- | fs/posix_acl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/posix_acl.c b/fs/posix_acl.c index 4adde1e2cbec..571465d6df58 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c | |||
@@ -845,7 +845,7 @@ posix_acl_xattr_list(const struct xattr_handler *handler, | |||
845 | } | 845 | } |
846 | 846 | ||
847 | const struct xattr_handler posix_acl_access_xattr_handler = { | 847 | const struct xattr_handler posix_acl_access_xattr_handler = { |
848 | .prefix = POSIX_ACL_XATTR_ACCESS, | 848 | .prefix = XATTR_NAME_POSIX_ACL_ACCESS, |
849 | .flags = ACL_TYPE_ACCESS, | 849 | .flags = ACL_TYPE_ACCESS, |
850 | .list = posix_acl_xattr_list, | 850 | .list = posix_acl_xattr_list, |
851 | .get = posix_acl_xattr_get, | 851 | .get = posix_acl_xattr_get, |
@@ -854,7 +854,7 @@ const struct xattr_handler posix_acl_access_xattr_handler = { | |||
854 | EXPORT_SYMBOL_GPL(posix_acl_access_xattr_handler); | 854 | EXPORT_SYMBOL_GPL(posix_acl_access_xattr_handler); |
855 | 855 | ||
856 | const struct xattr_handler posix_acl_default_xattr_handler = { | 856 | const struct xattr_handler posix_acl_default_xattr_handler = { |
857 | .prefix = POSIX_ACL_XATTR_DEFAULT, | 857 | .prefix = XATTR_NAME_POSIX_ACL_DEFAULT, |
858 | .flags = ACL_TYPE_DEFAULT, | 858 | .flags = ACL_TYPE_DEFAULT, |
859 | .list = posix_acl_xattr_list, | 859 | .list = posix_acl_xattr_list, |
860 | .get = posix_acl_xattr_get, | 860 | .get = posix_acl_xattr_get, |