ceph: add acl for cephfs
authorGuangliang Zhao <lucienchao@gmail.com>
Mon, 11 Nov 2013 07:18:03 +0000 (15:18 +0800)
committerIlya Dryomov <ilya.dryomov@inktank.com>
Tue, 31 Dec 2013 18:32:01 +0000 (20:32 +0200)
Signed-off-by: Guangliang Zhao <lucienchao@gmail.com>
Reviewed-by: Li Wang <li.wang@ubuntykylin.com>
Reviewed-by: Zheng Yan <zheng.z.yan@intel.com>
fs/ceph/Kconfig
fs/ceph/Makefile
fs/ceph/acl.c [new file with mode: 0644]
fs/ceph/caps.c
fs/ceph/dir.c
fs/ceph/inode.c
fs/ceph/super.c
fs/ceph/super.h
fs/ceph/xattr.c

diff --cc fs/ceph/Kconfig
Simple merge
Simple merge
diff --cc fs/ceph/acl.c
Simple merge
diff --cc fs/ceph/caps.c
Simple merge
diff --cc fs/ceph/dir.c
Simple merge
diff --cc fs/ceph/inode.c
Simple merge
diff --cc fs/ceph/super.c
Simple merge
diff --cc fs/ceph/super.h
Simple merge
diff --cc fs/ceph/xattr.c
Simple merge