Commit 73dec82d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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
parents 1d2ba7fe ffc4c922

fs/xattr.c

+13 −11
Original line number Diff line number Diff line
@@ -948,6 +948,7 @@ ssize_t simple_xattr_list(struct inode *inode, struct simple_xattrs *xattrs, 
	int err = 0;



#ifdef CONFIG_FS_POSIX_ACL

	if (IS_POSIXACL(inode)) {

		if (inode->i_acl) {

			err = xattr_list_one(&buffer, &remaining_size,

					     XATTR_NAME_POSIX_ACL_ACCESS);
@@ -960,6 +961,7 @@ ssize_t simple_xattr_list(struct inode *inode, struct simple_xattrs *xattrs, 
			if (err)

				return err;

		}

	}

#endif



	spin_lock(&xattrs->lock);