summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2014-01-29 06:22:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-29 16:05:28 -0800
commit72466d0b92e04a7e0e5abf74c86eb352225346e4 (patch)
treee165c2b610135f801489f13c7d8e3cbc3acfd3fc /init
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 'init')
0 files changed, 0 insertions, 0 deletions