Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'jfs-3.14-rc2' of git://github.com/kleikamp/linux-shaggy
Pull jfs fix from David Kleikamp:
"Fix regression"
* tag 'jfs-3.14-rc2' of git://github.com/kleikamp/linux-shaggy:
jfs: fix generic posix ACL regression
+7
-7
+7
-7
fs/jfs/xattr.c
+7
-7
fs/jfs/xattr.c
···
854
854
int rc;
855
855
tid_t tid;
856
856
857
-
if ((rc = can_set_xattr(inode, name, value, value_len)))
858
-
return rc;
859
-
860
857
/*
861
858
* If this is a request for a synthetic attribute in the system.*
862
859
* namespace use the generic infrastructure to resolve a handler
···
861
864
*/
862
865
if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
863
866
return generic_setxattr(dentry, name, value, value_len, flags);
867
+
868
+
if ((rc = can_set_xattr(inode, name, value, value_len)))
869
+
return rc;
864
870
865
871
if (value == NULL) { /* empty EA, do not remove */
866
872
value = "";
···
1034
1034
int rc;
1035
1035
tid_t tid;
1036
1036
1037
-
if ((rc = can_set_xattr(inode, name, NULL, 0)))
1038
-
return rc;
1039
-
1040
1037
/*
1041
1038
* If this is a request for a synthetic attribute in the system.*
1042
1039
* namespace use the generic infrastructure to resolve a handler
···
1041
1044
*/
1042
1045
if (!strncmp(name, XATTR_SYSTEM_PREFIX, XATTR_SYSTEM_PREFIX_LEN))
1043
1046
return generic_removexattr(dentry, name);
1047
+
1048
+
if ((rc = can_set_xattr(inode, name, NULL, 0)))
1049
+
return rc;
1044
1050
1045
1051
tid = txBegin(inode->i_sb, 0);
1046
1052
mutex_lock(&ji->commit_mutex);
···
1061
1061
* attributes are handled directly.
1062
1062
*/
1063
1063
const struct xattr_handler *jfs_xattr_handlers[] = {
1064
-
#ifdef JFS_POSIX_ACL
1064
+
#ifdef CONFIG_JFS_POSIX_ACL
1065
1065
&posix_acl_access_xattr_handler,
1066
1066
&posix_acl_default_xattr_handler,
1067
1067
#endif