Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Al writes:
  "xattrs regression fix from Andreas; sat in -next for quite a while."

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  sysfs: Do not return POSIX ACL xattrs via listxattr

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,
         int err = 0;
 
 #ifdef CONFIG_FS_POSIX_ACL
-        if (inode->i_acl) {
-                err = xattr_list_one(&buffer, &remaining_size,
-                                     XATTR_NAME_POSIX_ACL_ACCESS);
-                if (err)
-                        return err;
-        }
-        if (inode->i_default_acl) {
-                err = xattr_list_one(&buffer, &remaining_size,
-                                     XATTR_NAME_POSIX_ACL_DEFAULT);
-                if (err)
-                        return err;
+        if (IS_POSIXACL(inode)) {
+                if (inode->i_acl) {
+                        err = xattr_list_one(&buffer, &remaining_size,
+                                             XATTR_NAME_POSIX_ACL_ACCESS);
+                        if (err)
+                                return err;
+                }
+                if (inode->i_default_acl) {
+                        err = xattr_list_one(&buffer, &remaining_size,
+                                             XATTR_NAME_POSIX_ACL_DEFAULT);
+                        if (err)
+                                return err;
+                }
         }
 #endif