Skip to content
Commit 72466d0b authored by Sage Weil's avatar Sage Weil Committed by Linus Torvalds
Browse files

ceph: fix posix ACL hooks

The merge of commit 7221fe4c ("ceph: add acl for cephfs") raced with
upstream changes in the generic POSIX ACL code (eg commit 2aeccbe9
"fs: add generic xattr_acl handlers" and others).

Some of the fallout was fixed in commit 4db658ea

 ("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: default avatarSage Weil <sage@inktank.com>
Signed-off-by: default avatarIlya Dryomov <ilya.dryomov@inktank.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0e47c969
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment