diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-07 20:09:18 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-07 20:09:18 -0400 |
commit | bf02f5d2c080cf61b770e09add602ca360d538fb (patch) | |
tree | 1899f41554f8778a4cc1860adb53c95deaedaafb /drivers/staging/lustre/lustre/llite/namei.c | |
parent | ecryptfs: Switch to generic xattr handlers (diff) | |
parent | staging: lustre: llite: basic port to xattr_handler API (diff) | |
download | linux-dev-bf02f5d2c080cf61b770e09add602ca360d538fb.tar.xz linux-dev-bf02f5d2c080cf61b770e09add602ca360d538fb.zip |
Merge commit '2c563880ea' into work.xattr
pick xattr_handler conversion from lustre tree
Diffstat (limited to 'drivers/staging/lustre/lustre/llite/namei.c')
-rw-r--r-- | drivers/staging/lustre/lustre/llite/namei.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c index 2c4dc69731e8..09e180170de2 100644 --- a/drivers/staging/lustre/lustre/llite/namei.c +++ b/drivers/staging/lustre/lustre/llite/namei.c @@ -1106,10 +1106,10 @@ const struct inode_operations ll_dir_inode_operations = { .setattr = ll_setattr, .getattr = ll_getattr, .permission = ll_inode_permission, - .setxattr = ll_setxattr, - .getxattr = ll_getxattr, + .setxattr = generic_setxattr, + .getxattr = generic_getxattr, .listxattr = ll_listxattr, - .removexattr = ll_removexattr, + .removexattr = generic_removexattr, .get_acl = ll_get_acl, }; @@ -1117,9 +1117,9 @@ const struct inode_operations ll_special_inode_operations = { .setattr = ll_setattr, .getattr = ll_getattr, .permission = ll_inode_permission, - .setxattr = ll_setxattr, - .getxattr = ll_getxattr, + .setxattr = generic_setxattr, + .getxattr = generic_getxattr, .listxattr = ll_listxattr, - .removexattr = ll_removexattr, + .removexattr = generic_removexattr, .get_acl = ll_get_acl, }; |