Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

fs/ceph/acl.c

+4 −5
Original line number Diff line number Diff line
@@ -107,14 +107,14 @@ struct posix_acl *ceph_get_acl(struct inode *inode, int type) 
	return acl;

}



static int ceph_set_acl(struct dentry *dentry, struct inode *inode,

				struct posix_acl *acl, int type)

int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type)

{

	int ret = 0, size = 0;

	const char *name = NULL;

	char *value = NULL;

	struct iattr newattrs;

	umode_t new_mode = inode->i_mode, old_mode = inode->i_mode;

	struct dentry *dentry = d_find_alias(inode);



	if (acl) {

		ret = posix_acl_valid(acl);
@@ -208,8 +208,7 @@ int ceph_init_acl(struct dentry *dentry, struct inode *inode, struct inode *dir) 


	if (IS_POSIXACL(dir) && acl) {

		if (S_ISDIR(inode->i_mode)) {

			ret = ceph_set_acl(dentry, inode, acl,

						ACL_TYPE_DEFAULT);

			ret = ceph_set_acl(inode, acl, ACL_TYPE_DEFAULT);

			if (ret)

				goto out_release;

		}
@@ -217,7 +216,7 @@ int ceph_init_acl(struct dentry *dentry, struct inode *inode, struct inode *dir) 
		if (ret < 0)

			goto out;

		else if (ret > 0)

			ret = ceph_set_acl(dentry, inode, acl, ACL_TYPE_ACCESS);

			ret = ceph_set_acl(inode, acl, ACL_TYPE_ACCESS);

		else

			cache_no_acl(inode);

	} else {

fs/ceph/dir.c

+1 −0
Original line number Diff line number Diff line
@@ -1303,6 +1303,7 @@ const struct inode_operations ceph_dir_iops = { 
	.listxattr = ceph_listxattr,

	.removexattr = ceph_removexattr,

	.get_acl = ceph_get_acl,

	.set_acl = ceph_set_acl,

	.mknod = ceph_mknod,

	.symlink = ceph_symlink,

	.mkdir = ceph_mkdir,

fs/ceph/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ const struct inode_operations ceph_file_iops = { 
	.listxattr = ceph_listxattr,

	.removexattr = ceph_removexattr,

	.get_acl = ceph_get_acl,

	.set_acl = ceph_set_acl,

};
@@ -1616,6 +1617,7 @@ static const struct inode_operations ceph_symlink_iops = { 
	.listxattr = ceph_listxattr,

	.removexattr = ceph_removexattr,

	.get_acl = ceph_get_acl,

	.set_acl = ceph_set_acl,

};



/*

fs/ceph/super.h

+3 −0
Original line number Diff line number Diff line
@@ -718,6 +718,7 @@ extern void ceph_queue_writeback(struct inode *inode); 
extern int ceph_do_getattr(struct inode *inode, int mask);

extern int ceph_permission(struct inode *inode, int mask);

extern int ceph_setattr(struct dentry *dentry, struct iattr *attr);

extern int ceph_setattr(struct dentry *dentry, struct iattr *attr);

extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry,

			struct kstat *stat);
@@ -741,12 +742,14 @@ extern const struct xattr_handler *ceph_xattr_handlers[]; 
#ifdef CONFIG_CEPH_FS_POSIX_ACL



struct posix_acl *ceph_get_acl(struct inode *, int);

int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type);

int ceph_init_acl(struct dentry *, struct inode *, struct inode *);

void ceph_forget_all_cached_acls(struct inode *inode);



#else



#define ceph_get_acl NULL

#define ceph_set_acl NULL



static inline int ceph_init_acl(struct dentry *dentry, struct inode *inode,

				struct inode *dir)