|
@@ -948,17 +948,19 @@ ssize_t simple_xattr_list(struct inode *inode, struct simple_xattrs *xattrs,
|
|
int err = 0;
|
|
int err = 0;
|
|
|
|
|
|
#ifdef CONFIG_FS_POSIX_ACL
|
|
#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
|
|
#endif
|
|
|
|
|