aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xattr.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xattr.c')
-rw-r--r--fs/xattr.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/fs/xattr.c b/fs/xattr.c
index daa732550088..0d6a6a4af861 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -948,17 +948,19 @@ ssize_t simple_xattr_list(struct inode *inode, struct simple_xattrs *xattrs,
948 int err = 0; 948 int err = 0;
949 949
950#ifdef CONFIG_FS_POSIX_ACL 950#ifdef CONFIG_FS_POSIX_ACL
951 if (inode->i_acl) { 951 if (IS_POSIXACL(inode)) {
952 err = xattr_list_one(&buffer, &remaining_size, 952 if (inode->i_acl) {
953 XATTR_NAME_POSIX_ACL_ACCESS); 953 err = xattr_list_one(&buffer, &remaining_size,
954 if (err) 954 XATTR_NAME_POSIX_ACL_ACCESS);
955 return err; 955 if (err)
956 } 956 return err;
957 if (inode->i_default_acl) { 957 }
958 err = xattr_list_one(&buffer, &remaining_size, 958 if (inode->i_default_acl) {
959 XATTR_NAME_POSIX_ACL_DEFAULT); 959 err = xattr_list_one(&buffer, &remaining_size,
960 if (err) 960 XATTR_NAME_POSIX_ACL_DEFAULT);
961 return err; 961 if (err)
962 return err;
963 }
962 } 964 }
963#endif 965#endif
964 966