aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph/dir.c
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2014-01-29 09:22:25 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-29 19:05:28 -0500
commit72466d0b92e04a7e0e5abf74c86eb352225346e4 (patch)
treee165c2b610135f801489f13c7d8e3cbc3acfd3fc /fs/ceph/dir.c
parent0e47c969c65e213421450c31043353ebe3c67e0c (diff)
ceph: fix posix ACL hooks
The merge of commit 7221fe4c2ed7 ("ceph: add acl for cephfs") raced with upstream changes in the generic POSIX ACL code (eg commit 2aeccbe957d0 "fs: add generic xattr_acl handlers" and others). Some of the fallout was fixed in commit 4db658ea0ca ("ceph: Fix up after semantic merge conflict"), but it was incomplete: the set_acl inode_operation wasn't getting set, and the prototype needed to be adjusted a bit (it doesn't take a dentry anymore). Signed-off-by: Sage Weil <sage@inktank.com> Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ceph/dir.c')
-rw-r--r--fs/ceph/dir.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 619616d585b0..6da4df84ba30 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -1303,6 +1303,7 @@ const struct inode_operations ceph_dir_iops = {
1303 .listxattr = ceph_listxattr, 1303 .listxattr = ceph_listxattr,
1304 .removexattr = ceph_removexattr, 1304 .removexattr = ceph_removexattr,
1305 .get_acl = ceph_get_acl, 1305 .get_acl = ceph_get_acl,
1306 .set_acl = ceph_set_acl,
1306 .mknod = ceph_mknod, 1307 .mknod = ceph_mknod,
1307 .symlink = ceph_symlink, 1308 .symlink = ceph_symlink,
1308 .mkdir = ceph_mkdir, 1309 .mkdir = ceph_mkdir,