diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2015-12-02 14:44:35 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-12-07 03:25:17 +0100 |
| commit | 97d79299223baab330b194437e676d301f12d5f6 (patch) | |
| tree | 7845b5fe37465c52d3a8584b4f00945617333a0d /fs/posix_acl.c | |
| parent | gfs2: Remove gfs2_xattr_acl_chmod (diff) | |
| download | linux-97d79299223baab330b194437e676d301f12d5f6.tar.xz linux-97d79299223baab330b194437e676d301f12d5f6.zip | |
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, } const struct xattr_handler posix_acl_access_xattr_handler = { - .prefix = POSIX_ACL_XATTR_ACCESS, + .prefix = XATTR_NAME_POSIX_ACL_ACCESS, .flags = ACL_TYPE_ACCESS, .list = posix_acl_xattr_list, .get = posix_acl_xattr_get, @@ -854,7 +854,7 @@ const struct xattr_handler posix_acl_access_xattr_handler = { EXPORT_SYMBOL_GPL(posix_acl_access_xattr_handler); const struct xattr_handler posix_acl_default_xattr_handler = { - .prefix = POSIX_ACL_XATTR_DEFAULT, + .prefix = XATTR_NAME_POSIX_ACL_DEFAULT, .flags = ACL_TYPE_DEFAULT, .list = posix_acl_xattr_list, .get = posix_acl_xattr_get, |