ceph: add acl for cephfs
RFC PATCH 1/1 ceph: add acl for cephfs
Add ACL support for cephfs, any comments are appreciated.
--- fs/ceph/Kconfig | 13 +++ fs/ceph/Makefile | 1 + fs/ceph/acl.c | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ceph/dir.c | 5 + fs/ceph/inode.c | 13 ++- fs/ceph/super.c | 4 + fs/ceph/super.h | 31 ++++++ fs/ceph/xattr.c | 60 +++++++++--- 8 files changed, 400 insertions(+), 13 deletions(-) create mode 100644 fs/ceph/acl.c
fs/ceph/Kconfig +13 -0
@@ -25,3 +25,16 @@ config CEPH_FSCACHE caching support for Ceph clients using FS-Cache endif + +config CEPH_FS_POSIX_ACL + bool "Ceph POSIX Access Control Lists" + depends on CEPH_FS + select FS_POSIX_ACL + help + POSIX Access Control Lists (ACLs) support permissions for users and + groups beyond the owner/group/world scheme. + + To learn more about Access Control Lists, visit the POSIX ACLs for + Linux website <http://acl.bestbits.at/>. + + If you don't know what Access Control Lists are, say N
fs/ceph/Makefile +1 -0
@@ -10,3 +10,4 @@ ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ debugfs.o ceph-$(CONFIG_CEPH_FSCACHE) += cache.o +ceph-$(CONFIG_CEPH_FS_POSIX_ACL) += acl.o
fs/ceph/acl.c new file +286 -0
286 lines not on this page · raw message
fs/ceph/dir.c +5 -0
@@ -693,6 +693,10 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,if (!err && !req->r_reply_info.head->is_dentry) err =ceph_handle_notrace_create (dir, dentry);ceph_mdsc_put_request (req); + +if (!err) + err =ceph_init_acl (dentry, dentry->d_inode, dir); +if (err)d_drop (dentry);return err;
@@ -1293,6 +1297,7 @@ const struct inode_operations ceph_dir_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, .mknod = ceph_mknod, .symlink = ceph_symlink, .mkdir = ceph_mkdir,
fs/ceph/inode.c +12 -1
@@ -95,6 +95,7 @@ const struct inode_operations ceph_file_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };
@@ -1632,6 +1633,7 @@ static const struct inode_operations ceph_symlink_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };/*
@@ -1702,9 +1704,11 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr) attr->ia_mode);if (issued &CEPH_CAP_AUTH_EXCL ) { inode->i_mode = attr->ia_mode; - dirtied |=CEPH_CAP_AUTH_EXCL ; + dirtied |=CEPH_CAP_AUTH_EXCL |CEPH_CAP_XATTR_EXCL ; + ci->i_xattrs.dirty = true; }else if ((issued &CEPH_CAP_AUTH_SHARED ) ==0 || attr->ia_mode != inode->i_mode) { + inode->i_mode = attr->ia_mode; req->r_args.setattr.mode =cpu_to_le32 (attr->ia_mode); mask |=CEPH_SETATTR_MODE ; release |=CEPH_CAP_AUTH_SHARED ;
@@ -1820,6 +1824,12 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)if (inode_dirty_flags)__mark_inode_dirty (inode, inode_dirty_flags); +if (ia_valid &ATTR_MODE ) { + err =ceph_acl_chmod (dentry, inode); +if (err) + goto out_put; + } +if (mask) { req->r_inode = inode;ihold (inode);
@@ -1839,6 +1849,7 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)return err; out:spin_unlock (&ci->i_ceph_lock); +out_put:ceph_mdsc_put_request (req);return err; }
fs/ceph/super.c +4 -0
@@ -819,7 +819,11 @@ static int ceph_set_super(struct super_block *s, void *data) s->s_flags = fsc->mount_options->sb_flags; s->s_maxbytes =1ULL <<40 ;/* temp value until we get mdsmap */ +#ifdef CONFIG_CEPH_FS_POSIX_ACL + s->s_flags |=MS_POSIXACL ; +#endif + s->s_xattr = ceph_xattr_handlers; s->s_fs_info = fsc; fsc->sb = s;
fs/ceph/super.h +31 -0
@@ -725,6 +725,9 @@ extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry,/* xattr.c */ extern int ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +int __ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +ssize_t __ceph_getxattr (struct inode *,const char *,void *,size_t ); +int __ceph_removexattr (struct dentry *,const char *);extern ssize_t ceph_getxattr (struct dentry *,const char *,void *,size_t );extern ssize_t ceph_listxattr (struct dentry *,char *,size_t );extern int ceph_removexattr (struct dentry *,const char *);
@@ -733,6 +736,34 @@ extern void __ceph_destroy_xattrs(struct ceph_inode_info *ci);extern void __init ceph_xattr_init (void );extern void ceph_xattr_exit (void ); +/* acl.c */ +extern const struct xattr_handler ceph_xattr_acl_access_handler; +extern const struct xattr_handler ceph_xattr_acl_default_handler; +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_init_acl (struct dentry *,struct inode *,struct inode *); +int ceph_acl_chmod (struct dentry *,struct inode *); + +#else + +#define ceph_get_acl NULL + +static inline int ceph_init_acl (struct dentry *dentry,struct inode *inode, +struct inode *dir) +{ +return 0 ; +} + +static inline int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +return 0 ; +} + +#endif +/* caps.c */ extern const char *ceph_cap_string (int c); extern void ceph_handle_caps(struct ceph_mds_session *session,
fs/ceph/xattr.c +48 -12
124 lines not on this page · raw message
Signature · 1 line
1.7.9.5
Hi,
I did not take a careful look at the code. But it seems to me that
for Ceph, the same directory could be mounted to different clients with totally different uid/gid, not aware of each other. The ACL won't make much sense and may not work properly.
Quoted 618 lines · Guangliang Zhao
Add ACL support for cephfs, any comments are appreciated.
Signed-off-by Guangliang Zhao <[email protected]>--- fs/ceph/Kconfig | 13 +++ fs/ceph/Makefile | 1 + fs/ceph/acl.c | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ceph/dir.c | 5 + fs/ceph/inode.c | 13 ++- fs/ceph/super.c | 4 + fs/ceph/super.h | 31 ++++++ fs/ceph/xattr.c | 60 +++++++++--- 8 files changed, 400 insertions(+), 13 deletions(-)create mode 100644
fs/ceph/acl.cfs/ceph/Kconfig +13
-0@@ -25,3 +25,16 @@ config CEPH_FSCACHE caching support for Ceph clients using FS-Cache endif + +config CEPH_FS_POSIX_ACL + bool "Ceph POSIX Access Control Lists" + depends on CEPH_FS + select FS_POSIX_ACL + help + POSIX Access Control Lists (ACLs) support permissions for users and + groups beyond the owner/group/world scheme. + + To learn more about Access Control Lists, visit the POSIX ACLs for + Linux website <http://acl.bestbits.at/>. + + If you don't know what Access Control Lists are, say Nfs/ceph/Makefile +1
-0@@ -10,3 +10,4 @@ ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ debugfs.o ceph-$(CONFIG_CEPH_FSCACHE) += cache.o +ceph-$(CONFIG_CEPH_FS_POSIX_ACL) += acl.ofs/ceph/acl.c new file +286
-0@@ -0,0 +1,286 @@ +/* +* linux/fs/ceph/acl.c +* +* Copyright (C) 2013 Guangliang Zhao, <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public +* License v2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public +* License along with this program; if not, write to the +* Free Software Foundation, Inc., 59 Temple Place - Suite 330, +* Boston, MA 021110-1307, USA. +*/ + +#include <linux/ceph/ceph_debug.h> +#include <linux/fs.h> +#include <linux/string.h> +#include <linux/xattr.h> +#include <linux/posix_acl_xattr.h> +#include <linux/posix_acl.h> +#include <linux/sched.h> +#include <linux/slab.h> + +#include "super.h" + +struct posix_acl *ceph_get_acl (struct inode *inode,int type) +{ +int size; +const char *name; +char *value =NULL ; +struct posix_acl *acl; + +if (!IS_POSIXACL (inode)) +return NULL ; + + acl =get_cached_acl (inode, type); +if (acl !=ACL_NOT_CACHED ) +return acl; + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +break ; +case ACL_TYPE_DEFAULT : + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : +BUG (); + } + + size =__ceph_getxattr (inode, name,"" ,0 ); +if (size >0 ) { + value =kzalloc (size,GFP_NOFS ); +if (!value) +return ERR_PTR (-ENOMEM ); + size =__ceph_getxattr (inode, name, value, size); + } + +if (size >0 ) + acl =posix_acl_from_xattr (&init_user_ns, value, size); +else if (size == -ERANGE || size == -ENODATA || size ==0 ) + acl =NULL ; +else + acl =ERR_PTR (-EIO ); + +kfree (value); + +if (!IS_ERR (acl)) +set_cached_acl (inode, type, acl); + +return acl; +} + +static int ceph_set_acl (struct dentry *dentry,struct inode *inode, +struct posix_acl *acl,int type) +{ +int ret =0 , size =0 ; +const char *name =NULL ; +char *value =NULL ; + +if (acl) { + ret =posix_acl_valid (acl); +if (ret <0 ) + goto out; + } + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +if (acl) { + ret =posix_acl_equiv_mode (acl, &inode->i_mode); +if (ret <0 ) + goto out; +if (ret ==0 ) + acl =NULL ; + } +break ; +case ACL_TYPE_DEFAULT : +if (!S_ISDIR (inode->i_mode)) { + ret = acl ? -EINVAL :0 ; + goto out; + } + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : + ret = -EINVAL ; + goto out; + } + +if (acl) { + size =posix_acl_xattr_size (acl->a_count); + value =kmalloc (size,GFP_NOFS ); +if (!value) { + ret = -ENOMEM ; + goto out; + } + + ret =posix_acl_to_xattr (&init_user_ns, acl, value, size); +if (ret <0 ) + goto out_free; + } + +if (value) + ret =__ceph_setxattr (dentry, name, value, size,0 ); +else + ret =__ceph_removexattr (dentry, name); + +if (ret) + goto out_free; + +set_cached_acl (inode, type, acl); + +out_free: +kfree (value); +out: +return ret; +} + +int ceph_init_acl (struct dentry *dentry,struct inode *inode,struct inode *dir) +{ +struct posix_acl *acl =NULL ; +int ret =0 ; + +if (!S_ISLNK (inode->i_mode)) { +if (IS_POSIXACL (dir)) { + acl =ceph_get_acl (dir,ACL_TYPE_DEFAULT ); +if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + } + +if (!acl) + inode->i_mode &= ~current_umask (); + } + +if (IS_POSIXACL (dir) && acl) { +if (S_ISDIR (inode->i_mode)) { + ret =ceph_set_acl (dentry, inode, acl, +ACL_TYPE_DEFAULT ); +if (ret) + goto out_release; + } + ret =posix_acl_create (&acl,GFP_NOFS , &inode->i_mode); +if (ret <0 ) + goto out; +else if (ret >0 ) + ret =ceph_set_acl (dentry, inode, acl,ACL_TYPE_ACCESS ); +else +cache_no_acl (inode); + }else { +cache_no_acl (inode); + } + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +struct posix_acl *acl; +int ret =0 ; + +if (S_ISLNK (inode->i_mode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (!IS_POSIXACL (inode)) + goto out; + + acl =ceph_get_acl (inode,ACL_TYPE_ACCESS ); +if (IS_ERR_OR_NULL (acl)) { + ret =PTR_ERR (acl); + goto out; + } + + ret =posix_acl_chmod (&acl,GFP_KERNEL , inode->i_mode); +if (ret) + goto out; + ret =ceph_set_acl (dentry, inode, acl,ACL_TYPE_ACCESS ); +posix_acl_release (acl); +out: +return ret; +} + +static int ceph_xattr_acl_get (struct dentry *dentry,const char *name, +void *value,size_t size,int type) +{ +struct posix_acl *acl; +int ret =0 ; + +if (!IS_POSIXACL (dentry->d_inode)) +return -EOPNOTSUPP ; + + acl =ceph_get_acl (dentry->d_inode, type); +if (IS_ERR (acl)) +return PTR_ERR (acl); +if (acl ==NULL ) +return -ENODATA ; + + ret =posix_acl_to_xattr (&init_user_ns, acl, value, size); +posix_acl_release (acl); + +return ret; +} + +static int ceph_xattr_acl_set (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags,int type) +{ +int ret =0 ; +struct posix_acl *acl =NULL ; + +if (!inode_owner_or_capable (dentry->d_inode)) { + ret = -EPERM ; + goto out; + } + +if (!IS_POSIXACL (dentry->d_inode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (value) { + acl =posix_acl_from_xattr (&init_user_ns, value, size); +if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + +if (acl) { + ret =posix_acl_valid (acl); +if (ret) + goto out_release; + } + } + + ret =ceph_set_acl (dentry, dentry->d_inode, acl, type); + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +const struct xattr_handler ceph_xattr_acl_default_handler = { + .prefix =POSIX_ACL_XATTR_DEFAULT , + .flags =ACL_TYPE_DEFAULT , + .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +}; + +const struct xattr_handler ceph_xattr_acl_access_handler = { + .prefix =POSIX_ACL_XATTR_ACCESS , + .flags =ACL_TYPE_ACCESS , + .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +};fs/ceph/dir.c +5
-0@@ -693,6 +693,10 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,if (!err && !req->r_reply_info.head->is_dentry) err =ceph_handle_notrace_create (dir, dentry);ceph_mdsc_put_request (req); + +if (!err) + err =ceph_init_acl (dentry, dentry->d_inode, dir); +if (err)d_drop (dentry);return err;@@ -1293,6 +1297,7 @@ const struct inode_operations ceph_dir_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, .mknod = ceph_mknod, .symlink = ceph_symlink, .mkdir = ceph_mkdir,fs/ceph/inode.c +12
-1@@ -95,6 +95,7 @@ const struct inode_operations ceph_file_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };@@ -1632,6 +1633,7 @@ static const struct inode_operations ceph_symlink_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };/* @@ -1702,9 +1704,11 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr) attr->ia_mode);if (issued &CEPH_CAP_AUTH_EXCL ) { inode->i_mode = attr->ia_mode; - dirtied |=CEPH_CAP_AUTH_EXCL ; + dirtied |=CEPH_CAP_AUTH_EXCL |CEPH_CAP_XATTR_EXCL ; + ci->i_xattrs.dirty = true; }else if ((issued &CEPH_CAP_AUTH_SHARED ) ==0 || attr->ia_mode != inode->i_mode) { + inode->i_mode = attr->ia_mode; req->r_args.setattr.mode =cpu_to_le32 (attr->ia_mode); mask |=CEPH_SETATTR_MODE ; release |=CEPH_CAP_AUTH_SHARED ;@@ -1820,6 +1824,12 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)if (inode_dirty_flags)__mark_inode_dirty (inode, inode_dirty_flags); +if (ia_valid &ATTR_MODE ) { + err =ceph_acl_chmod (dentry, inode); +if (err) + goto out_put; + } +if (mask) { req->r_inode = inode;ihold (inode);@@ -1839,6 +1849,7 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)return err; out:spin_unlock (&ci->i_ceph_lock); +out_put:ceph_mdsc_put_request (req);return err; }fs/ceph/super.c +4
-0@@ -819,7 +819,11 @@ static int ceph_set_super(struct super_block *s, void *data) s->s_flags = fsc->mount_options->sb_flags; s->s_maxbytes =1ULL <<40 ;/* temp value until we get mdsmap */ +#ifdef CONFIG_CEPH_FS_POSIX_ACL + s->s_flags |=MS_POSIXACL ; +#endif + s->s_xattr = ceph_xattr_handlers; s->s_fs_info = fsc; fsc->sb = s;fs/ceph/super.h +31
-0@@ -725,6 +725,9 @@ extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry,/* xattr.c */ extern int ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +int __ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +ssize_t __ceph_getxattr (struct inode *,const char *,void *,size_t ); +int __ceph_removexattr (struct dentry *,const char *);extern ssize_t ceph_getxattr (struct dentry *,const char *,void *,size_t );extern ssize_t ceph_listxattr (struct dentry *,char *,size_t );extern int ceph_removexattr (struct dentry *,const char *);@@ -733,6 +736,34 @@ extern void __ceph_destroy_xattrs(struct ceph_inode_info *ci);extern void __init ceph_xattr_init (void );extern void ceph_xattr_exit (void ); +/* acl.c */ +extern const struct xattr_handler ceph_xattr_acl_access_handler; +extern const struct xattr_handler ceph_xattr_acl_default_handler; +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_init_acl (struct dentry *,struct inode *,struct inode *); +int ceph_acl_chmod (struct dentry *,struct inode *); + +#else + +#define ceph_get_acl NULL + +static inline int ceph_init_acl (struct dentry *dentry,struct inode *inode, +struct inode *dir) +{ +return 0 ; +} + +static inline int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +return 0 ; +} + +#endif +/* caps.c */ extern const char *ceph_cap_string (int c); extern void ceph_handle_caps(struct ceph_mds_session *session,fs/ceph/xattr.c +48
-12@@ -11,11 +11,24 @@#define XATTR_CEPH_PREFIX "ceph."#define XATTR_CEPH_PREFIX_LEN (sizeof (XATTR_CEPH_PREFIX) - 1) +/* +* List of handlers for synthetic system.* attributes. Other +* attributes are handled directly. +*/ +const struct xattr_handler *ceph_xattr_handlers[] = { +#ifdef CONFIG_CEPH_FS_POSIX_ACL + &ceph_xattr_acl_access_handler, + &ceph_xattr_acl_default_handler, +#endif +NULL , +}; +static bool ceph_is_valid_xattr (const char *name) {return !strncmp (name,XATTR_CEPH_PREFIX ,XATTR_CEPH_PREFIX_LEN ) || !strncmp (name,XATTR_SECURITY_PREFIX ,XATTR_SECURITY_PREFIX_LEN ) || + !strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN ) || !strncmp (name,XATTR_TRUSTED_PREFIX ,XATTR_TRUSTED_PREFIX_LEN ) || !strncmp (name,XATTR_USER_PREFIX ,XATTR_USER_PREFIX_LEN ); }@@ -663,10 +676,9 @@ void __ceph_build_xattrs_blob(struct ceph_inode_info *ci) } } -ssize_t ceph_getxattr (struct dentry *dentry,const char *name,void *value, +ssize_t __ceph_getxattr (struct inode *inode,const char *name,void *value,size_t size) { -struct inode *inode = dentry->d_inode;struct ceph_inode_info *ci =ceph_inode (inode);int err;struct ceph_inode_xattr *xattr;@@ -675,7 +687,6 @@ ssize_t ceph_getxattr(struct dentry *dentry, const char *name, void *value,if (!ceph_is_valid_xattr (name))return -ENODATA ; -/* let's see if a virtual xattr was requested */ vxattr =ceph_match_vxattr (inode, name);if (vxattr && !(vxattr->exists_cb && !vxattr->exists_cb (ci))) {@@ -725,6 +736,15 @@ out:return err; } +ssize_t ceph_getxattr (struct dentry *dentry,const char *name,void *value, +size_t size) +{ +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_getxattr (dentry, name, value, size); + +return __ceph_getxattr (dentry->d_inode, name, value, size); +} +ssize_t ceph_listxattr (struct dentry *dentry,char *names,size_t size) {struct inode *inode = dentry->d_inode;@@ -863,8 +883,8 @@ out:return err; } -int ceph_setxattr (struct dentry *dentry,const char *name, -const void *value,size_t size,int flags) +int __ceph_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;@@ -879,9 +899,6 @@ int ceph_setxattr(struct dentry *dentry, const char *name,struct ceph_inode_xattr *xattr =NULL ;int required_blob_size; -if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -958,6 +975,18 @@ out:return err; } +int ceph_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) +{ +if (ceph_snap (dentry->d_inode) !=CEPH_NOSNAP ) +return -EROFS ; + +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_setxattr (dentry, name, value, size, flags); + +return __ceph_setxattr (dentry, name, value, size, flags); +} +static int ceph_send_removexattr (struct dentry *dentry,const char *name) {struct ceph_fs_client *fsc =ceph_sb_to_client (dentry->d_sb);@@ -984,7 +1013,7 @@ static int ceph_send_removexattr(struct dentry *dentry, const char *name)return err; } -int ceph_removexattr (struct dentry *dentry,const char *name) +int __ceph_removexattr (struct dentry *dentry,const char *name) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;@@ -994,9 +1023,6 @@ int ceph_removexattr(struct dentry *dentry, const char *name)int required_blob_size;int dirty; -if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -1053,3 +1079,13 @@ out:return err; } +int ceph_removexattr (struct dentry *dentry,const char *name) +{ +if (ceph_snap (dentry->d_inode) !=CEPH_NOSNAP ) +return -EROFS ; + +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_removexattr (dentry, name); + +return __ceph_removexattr (dentry, name); +}
On Thu, Oct 17, 2013 at 08:39:58PM +0800, Li Wang wrote:
Hi Li,
Thanks for your comments.
Quoted 4 lines
Hi,
I did not take a careful look at the code. But it seems to me that
for Ceph, the same directory could be mounted to different clients with totally different uid/gid, not aware of each other.
Cephfs is POSIX-compliant.
Quoted 2 lines
The ACL
won't make much sense and may not work properly.
Authorization in ceph could do part of the job, however, we still need ACL or something similar to. It could provide convenient privilege management and fine-grained access control at the subdir and file level. There may be some bugs in view of the first version for reviewing actually.
I found this feature http://tracker.ceph.com/issues/27 when answering your email and I think it is still valid even it was created several years ago.
Quoted 620 lines · Guangliang Zhao
Quoted 618 lines
Add ACL support for cephfs, any comments are appreciated.
Signed-off-by Guangliang Zhao <[email protected]>--- fs/ceph/Kconfig | 13 +++ fs/ceph/Makefile | 1 + fs/ceph/acl.c | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ceph/dir.c | 5 + fs/ceph/inode.c | 13 ++- fs/ceph/super.c | 4 + fs/ceph/super.h | 31 ++++++ fs/ceph/xattr.c | 60 +++++++++--- 8 files changed, 400 insertions(+), 13 deletions(-) create mode 100644 fs/ceph/acl.cfs/ceph/Kconfig +13
-0@@ -25,3 +25,16 @@ config CEPH_FSCACHE caching support for Ceph clients using FS-Cache endif + +config CEPH_FS_POSIX_ACL + bool "Ceph POSIX Access Control Lists" + depends on CEPH_FS + select FS_POSIX_ACL + help + POSIX Access Control Lists (ACLs) support permissions for users and + groups beyond the owner/group/world scheme. + + To learn more about Access Control Lists, visit the POSIX ACLs for + Linux website <http://acl.bestbits.at/>. + + If you don't know what Access Control Lists are, say Nfs/ceph/Makefile +1
-0@@ -10,3 +10,4 @@ ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ debugfs.o ceph-$(CONFIG_CEPH_FSCACHE) += cache.o +ceph-$(CONFIG_CEPH_FS_POSIX_ACL) += acl.ofs/ceph/acl.c new file +286
-0@@ -0,0 +1,286 @@ +/* +* linux/fs/ceph/acl.c +* +* Copyright (C) 2013 Guangliang Zhao, <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public +* License v2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public +* License along with this program; if not, write to the +* Free Software Foundation, Inc., 59 Temple Place - Suite 330, +* Boston, MA 021110-1307, USA. +*/ + +#include <linux/ceph/ceph_debug.h> +#include <linux/fs.h> +#include <linux/string.h> +#include <linux/xattr.h> +#include <linux/posix_acl_xattr.h> +#include <linux/posix_acl.h> +#include <linux/sched.h> +#include <linux/slab.h> + +#include "super.h" + +struct posix_acl *ceph_get_acl (struct inode *inode,int type) +{ +int size; +const char *name; +char *value =NULL ; +struct posix_acl *acl; + +if (!IS_POSIXACL (inode)) +return NULL ; + + acl =get_cached_acl (inode, type); +if (acl !=ACL_NOT_CACHED ) +return acl; + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +break ; +case ACL_TYPE_DEFAULT : + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : +BUG (); + } + + size =__ceph_getxattr (inode, name,"" ,0 ); +if (size >0 ) { + value =kzalloc (size,GFP_NOFS ); +if (!value) +return ERR_PTR (-ENOMEM ); + size =__ceph_getxattr (inode, name, value, size); + } + +if (size >0 ) + acl =posix_acl_from_xattr (&init_user_ns, value, size); +else if (size == -ERANGE || size == -ENODATA || size ==0 ) + acl =NULL ; +else + acl =ERR_PTR (-EIO ); + +kfree (value); + +if (!IS_ERR (acl)) +set_cached_acl (inode, type, acl); + +return acl; +} + +static int ceph_set_acl (struct dentry *dentry,struct inode *inode, +struct posix_acl *acl,int type) +{ +int ret =0 , size =0 ; +const char *name =NULL ; +char *value =NULL ; + +if (acl) { + ret =posix_acl_valid (acl); +if (ret <0 ) + goto out; + } + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +if (acl) { + ret =posix_acl_equiv_mode (acl, &inode->i_mode); +if (ret <0 ) + goto out; +if (ret ==0 ) + acl =NULL ; + } +break ; +case ACL_TYPE_DEFAULT : +if (!S_ISDIR (inode->i_mode)) { + ret = acl ? -EINVAL :0 ; + goto out; + } + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : + ret = -EINVAL ; + goto out; + } + +if (acl) { + size =posix_acl_xattr_size (acl->a_count); + value =kmalloc (size,GFP_NOFS ); +if (!value) { + ret = -ENOMEM ; + goto out; + } + + ret =posix_acl_to_xattr (&init_user_ns, acl, value, size); +if (ret <0 ) + goto out_free; + } + +if (value) + ret =__ceph_setxattr (dentry, name, value, size,0 ); +else + ret =__ceph_removexattr (dentry, name); + +if (ret) + goto out_free; + +set_cached_acl (inode, type, acl); + +out_free: +kfree (value); +out: +return ret; +} + +int ceph_init_acl (struct dentry *dentry,struct inode *inode,struct inode *dir) +{ +struct posix_acl *acl =NULL ; +int ret =0 ; + +if (!S_ISLNK (inode->i_mode)) { +if (IS_POSIXACL (dir)) { + acl =ceph_get_acl (dir,ACL_TYPE_DEFAULT ); +if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + } + +if (!acl) + inode->i_mode &= ~current_umask (); + } + +if (IS_POSIXACL (dir) && acl) { +if (S_ISDIR (inode->i_mode)) { + ret =ceph_set_acl (dentry, inode, acl, +ACL_TYPE_DEFAULT ); +if (ret) + goto out_release; + } + ret =posix_acl_create (&acl,GFP_NOFS , &inode->i_mode); +if (ret <0 ) + goto out; +else if (ret >0 ) + ret =ceph_set_acl (dentry, inode, acl,ACL_TYPE_ACCESS ); +else +cache_no_acl (inode); + }else { +cache_no_acl (inode); + } + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +struct posix_acl *acl; +int ret =0 ; + +if (S_ISLNK (inode->i_mode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (!IS_POSIXACL (inode)) + goto out; + + acl =ceph_get_acl (inode,ACL_TYPE_ACCESS ); +if (IS_ERR_OR_NULL (acl)) { + ret =PTR_ERR (acl); + goto out; + } + + ret =posix_acl_chmod (&acl,GFP_KERNEL , inode->i_mode); +if (ret) + goto out; + ret =ceph_set_acl (dentry, inode, acl,ACL_TYPE_ACCESS ); +posix_acl_release (acl); +out: +return ret; +} + +static int ceph_xattr_acl_get (struct dentry *dentry,const char *name, +void *value,size_t size,int type) +{ +struct posix_acl *acl; +int ret =0 ; + +if (!IS_POSIXACL (dentry->d_inode)) +return -EOPNOTSUPP ; + + acl =ceph_get_acl (dentry->d_inode, type); +if (IS_ERR (acl)) +return PTR_ERR (acl); +if (acl ==NULL ) +return -ENODATA ; + + ret =posix_acl_to_xattr (&init_user_ns, acl, value, size); +posix_acl_release (acl); + +return ret; +} + +static int ceph_xattr_acl_set (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags,int type) +{ +int ret =0 ; +struct posix_acl *acl =NULL ; + +if (!inode_owner_or_capable (dentry->d_inode)) { + ret = -EPERM ; + goto out; + } + +if (!IS_POSIXACL (dentry->d_inode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (value) { + acl =posix_acl_from_xattr (&init_user_ns, value, size); +if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + +if (acl) { + ret =posix_acl_valid (acl); +if (ret) + goto out_release; + } + } + + ret =ceph_set_acl (dentry, dentry->d_inode, acl, type); + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +const struct xattr_handler ceph_xattr_acl_default_handler = { + .prefix =POSIX_ACL_XATTR_DEFAULT , + .flags =ACL_TYPE_DEFAULT , + .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +}; + +const struct xattr_handler ceph_xattr_acl_access_handler = { + .prefix =POSIX_ACL_XATTR_ACCESS , + .flags =ACL_TYPE_ACCESS , + .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +};fs/ceph/dir.c +5
-0@@ -693,6 +693,10 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,if (!err && !req->r_reply_info.head->is_dentry) err =ceph_handle_notrace_create (dir, dentry);ceph_mdsc_put_request (req); + +if (!err) + err =ceph_init_acl (dentry, dentry->d_inode, dir); +if (err)d_drop (dentry);return err;@@ -1293,6 +1297,7 @@ const struct inode_operations ceph_dir_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, .mknod = ceph_mknod, .symlink = ceph_symlink, .mkdir = ceph_mkdir,fs/ceph/inode.c +12
-1@@ -95,6 +95,7 @@ const struct inode_operations ceph_file_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };@@ -1632,6 +1633,7 @@ static const struct inode_operations ceph_symlink_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };/* @@ -1702,9 +1704,11 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr) attr->ia_mode);if (issued &CEPH_CAP_AUTH_EXCL ) { inode->i_mode = attr->ia_mode; - dirtied |=CEPH_CAP_AUTH_EXCL ; + dirtied |=CEPH_CAP_AUTH_EXCL |CEPH_CAP_XATTR_EXCL ; + ci->i_xattrs.dirty = true; }else if ((issued &CEPH_CAP_AUTH_SHARED ) ==0 || attr->ia_mode != inode->i_mode) { + inode->i_mode = attr->ia_mode; req->r_args.setattr.mode =cpu_to_le32 (attr->ia_mode); mask |=CEPH_SETATTR_MODE ; release |=CEPH_CAP_AUTH_SHARED ;@@ -1820,6 +1824,12 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)if (inode_dirty_flags)__mark_inode_dirty (inode, inode_dirty_flags); +if (ia_valid &ATTR_MODE ) { + err =ceph_acl_chmod (dentry, inode); +if (err) + goto out_put; + } +if (mask) { req->r_inode = inode;ihold (inode);@@ -1839,6 +1849,7 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)return err; out:spin_unlock (&ci->i_ceph_lock); +out_put:ceph_mdsc_put_request (req);return err; }fs/ceph/super.c +4
-0@@ -819,7 +819,11 @@ static int ceph_set_super(struct super_block *s, void *data) s->s_flags = fsc->mount_options->sb_flags; s->s_maxbytes =1ULL <<40 ;/* temp value until we get mdsmap */ +#ifdef CONFIG_CEPH_FS_POSIX_ACL + s->s_flags |=MS_POSIXACL ; +#endif + s->s_xattr = ceph_xattr_handlers; s->s_fs_info = fsc; fsc->sb = s;fs/ceph/super.h +31
-0@@ -725,6 +725,9 @@ extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry,/* xattr.c */ extern int ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +int __ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +ssize_t __ceph_getxattr (struct inode *,const char *,void *,size_t ); +int __ceph_removexattr (struct dentry *,const char *);extern ssize_t ceph_getxattr (struct dentry *,const char *,void *,size_t );extern ssize_t ceph_listxattr (struct dentry *,char *,size_t );extern int ceph_removexattr (struct dentry *,const char *);@@ -733,6 +736,34 @@ extern void __ceph_destroy_xattrs(struct ceph_inode_info *ci);extern void __init ceph_xattr_init (void );extern void ceph_xattr_exit (void ); +/* acl.c */ +extern const struct xattr_handler ceph_xattr_acl_access_handler; +extern const struct xattr_handler ceph_xattr_acl_default_handler; +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_init_acl (struct dentry *,struct inode *,struct inode *); +int ceph_acl_chmod (struct dentry *,struct inode *); + +#else + +#define ceph_get_acl NULL + +static inline int ceph_init_acl (struct dentry *dentry,struct inode *inode, +struct inode *dir) +{ +return 0 ; +} + +static inline int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +return 0 ; +} + +#endif +/* caps.c */ extern const char *ceph_cap_string (int c); extern void ceph_handle_caps(struct ceph_mds_session *session,fs/ceph/xattr.c +48
-12@@ -11,11 +11,24 @@#define XATTR_CEPH_PREFIX "ceph."#define XATTR_CEPH_PREFIX_LEN (sizeof (XATTR_CEPH_PREFIX) - 1) +/* +* List of handlers for synthetic system.* attributes. Other +* attributes are handled directly. +*/ +const struct xattr_handler *ceph_xattr_handlers[] = { +#ifdef CONFIG_CEPH_FS_POSIX_ACL + &ceph_xattr_acl_access_handler, + &ceph_xattr_acl_default_handler, +#endif +NULL , +}; +static bool ceph_is_valid_xattr (const char *name) {return !strncmp (name,XATTR_CEPH_PREFIX ,XATTR_CEPH_PREFIX_LEN ) || !strncmp (name,XATTR_SECURITY_PREFIX ,XATTR_SECURITY_PREFIX_LEN ) || + !strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN ) || !strncmp (name,XATTR_TRUSTED_PREFIX ,XATTR_TRUSTED_PREFIX_LEN ) || !strncmp (name,XATTR_USER_PREFIX ,XATTR_USER_PREFIX_LEN ); }@@ -663,10 +676,9 @@ void __ceph_build_xattrs_blob(struct ceph_inode_info *ci) } } -ssize_t ceph_getxattr (struct dentry *dentry,const char *name,void *value, +ssize_t __ceph_getxattr (struct inode *inode,const char *name,void *value,size_t size) { -struct inode *inode = dentry->d_inode;struct ceph_inode_info *ci =ceph_inode (inode);int err;struct ceph_inode_xattr *xattr;@@ -675,7 +687,6 @@ ssize_t ceph_getxattr(struct dentry *dentry, const char *name, void *value,if (!ceph_is_valid_xattr (name))return -ENODATA ; -/* let's see if a virtual xattr was requested */ vxattr =ceph_match_vxattr (inode, name);if (vxattr && !(vxattr->exists_cb && !vxattr->exists_cb (ci))) {@@ -725,6 +736,15 @@ out:return err; } +ssize_t ceph_getxattr (struct dentry *dentry,const char *name,void *value, +size_t size) +{ +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_getxattr (dentry, name, value, size); + +return __ceph_getxattr (dentry->d_inode, name, value, size); +} +ssize_t ceph_listxattr (struct dentry *dentry,char *names,size_t size) {struct inode *inode = dentry->d_inode;@@ -863,8 +883,8 @@ out:return err; } -int ceph_setxattr (struct dentry *dentry,const char *name, -const void *value,size_t size,int flags) +int __ceph_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;@@ -879,9 +899,6 @@ int ceph_setxattr(struct dentry *dentry, const char *name,struct ceph_inode_xattr *xattr =NULL ;int required_blob_size; -if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -958,6 +975,18 @@ out:return err; } +int ceph_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) +{ +if (ceph_snap (dentry->d_inode) !=CEPH_NOSNAP ) +return -EROFS ; + +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_setxattr (dentry, name, value, size, flags); + +return __ceph_setxattr (dentry, name, value, size, flags); +} +static int ceph_send_removexattr (struct dentry *dentry,const char *name) {struct ceph_fs_client *fsc =ceph_sb_to_client (dentry->d_sb);@@ -984,7 +1013,7 @@ static int ceph_send_removexattr(struct dentry *dentry, const char *name)return err; } -int ceph_removexattr (struct dentry *dentry,const char *name) +int __ceph_removexattr (struct dentry *dentry,const char *name) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;@@ -994,9 +1023,6 @@ int ceph_removexattr(struct dentry *dentry, const char *name)int required_blob_size;int dirty; -if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -1053,3 +1079,13 @@ out:return err; } +int ceph_removexattr (struct dentry *dentry,const char *name) +{ +if (ceph_snap (dentry->d_inode) !=CEPH_NOSNAP ) +return -EROFS ; + +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_removexattr (dentry, name); + +return __ceph_removexattr (dentry, name); +}
Signature · 2 lines
Best regards, Guangliang
Quoted 16 lines · Li Wang
Hi Li,
Thanks for your comments.
Quoted 4 lines
Hi,
I did not take a careful look at the code. But it seems to me that
for Ceph, the same directory could be mounted to different clients with totally different uid/gid, not aware of each other.Cephfs is POSIX-compliant.
Quoted 2 lines
The ACL
won't make much sense and may not work properly.
Quoted 7 lines
Authorization in ceph could do part of the job, however, we still need ACL or something similar to. It could provide convenient privilege management and fine-grained access control at the subdir and file level. There may be some bugs in view of the first version for reviewing actually.
I found this feature http://tracker.ceph.com/issues/27 when answering your email and I think it is still valid even it was created several years ago.
looks like glusterfs has ACL support, so no reason for ceph not to support ACL. I'm a little busy this week, will review and test your patch next week.
Regards
Yan, Zheng
Quoted 629 lines
Quoted 610 lines · Guangliang Zhao
Quoted 607 lines
Add ACL support for cephfs, any comments are appreciated.
Signed-off-by Guangliang Zhao <[email protected]>--- fs/ceph/Kconfig | 13 +++ fs/ceph/Makefile | 1 + fs/ceph/acl.c | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ceph/dir.c | 5 + fs/ceph/inode.c | 13 ++- fs/ceph/super.c | 4 + fs/ceph/super.h | 31 ++++++ fs/ceph/xattr.c | 60 +++++++++--- 8 files changed, 400 insertions(+), 13 deletions(-) create mode 100644 fs/ceph/acl.cfs/ceph/Kconfig +13
-0@@ -25,3 +25,16 @@ config CEPH_FSCACHE caching support for Ceph clients using FS-Cache endif + +config CEPH_FS_POSIX_ACL + bool "Ceph POSIX Access Control Lists" + depends on CEPH_FS + select FS_POSIX_ACL + help + POSIX Access Control Lists (ACLs) support permissions for users and + groups beyond the owner/group/world scheme. + + To learn more about Access Control Lists, visit the POSIX ACLs for + Linux website <http://acl.bestbits.at/>. + + If you don't know what Access Control Lists are, say Nfs/ceph/Makefile +1
-0@@ -10,3 +10,4 @@ ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ debugfs.o ceph-$(CONFIG_CEPH_FSCACHE) += cache.o +ceph-$(CONFIG_CEPH_FS_POSIX_ACL) += acl.ofs/ceph/acl.c new file +286
-0@@ -0,0 +1,286 @@ +/* +* linux/fs/ceph/acl.c +* +* Copyright (C) 2013 Guangliang Zhao, <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public +* License v2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public +* License along with this program; if not, write to the +* Free Software Foundation, Inc., 59 Temple Place - Suite 330, +* Boston, MA 021110-1307, USA. +*/ + +#include <linux/ceph/ceph_debug.h> +#include <linux/fs.h> +#include <linux/string.h> +#include <linux/xattr.h> +#include <linux/posix_acl_xattr.h> +#include <linux/posix_acl.h> +#include <linux/sched.h> +#include <linux/slab.h> + +#include "super.h" + +struct posix_acl *ceph_get_acl (struct inode *inode,int type) +{ +int size; +const char *name; +char *value =NULL ; +struct posix_acl *acl; + +if (!IS_POSIXACL (inode)) +return NULL ; + + acl =get_cached_acl (inode, type); +if (acl !=ACL_NOT_CACHED ) +return acl; + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +break ; +case ACL_TYPE_DEFAULT : + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : +BUG (); + } + + size =__ceph_getxattr (inode, name,"" ,0 ); +if (size >0 ) { + value =kzalloc (size,GFP_NOFS ); +if (!value) +return ERR_PTR (-ENOMEM ); + size =__ceph_getxattr (inode, name, value, size); + } + +if (size >0 ) + acl =posix_acl_from_xattr (&init_user_ns, value, size); +else if (size == -ERANGE || size == -ENODATA || size ==0 ) + acl =NULL ; +else + acl =ERR_PTR (-EIO ); + +kfree (value); + +if (!IS_ERR (acl)) +set_cached_acl (inode, type, acl); + +return acl; +} + +static int ceph_set_acl (struct dentry *dentry,struct inode *inode, +struct posix_acl *acl,int type) +{ +int ret =0 , size =0 ; +const char *name =NULL ; +char *value =NULL ; + +if (acl) { + ret =posix_acl_valid (acl); +if (ret <0 ) + goto out; + } + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +if (acl) { + ret =posix_acl_equiv_mode (acl, &inode->i_mode); +if (ret <0 ) + goto out; +if (ret ==0 ) + acl =NULL ; + } +break ; +case ACL_TYPE_DEFAULT : +if (!S_ISDIR (inode->i_mode)) { + ret = acl ? -EINVAL :0 ; + goto out; + } + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : + ret = -EINVAL ; + goto out; + } + +if (acl) { + size =posix_acl_xattr_size (acl->a_count); + value =kmalloc (size,GFP_NOFS ); +if (!value) { + ret = -ENOMEM ; + goto out; + } + + ret =posix_acl_to_xattr (&init_user_ns, acl, value, size); +if (ret <0 ) + goto out_free; + } + +if (value) + ret =__ceph_setxattr (dentry, name, value, size,0 ); +else + ret =__ceph_removexattr (dentry, name); + +if (ret) + goto out_free; + +set_cached_acl (inode, type, acl); + +out_free: +kfree (value); +out: +return ret; +} + +int ceph_init_acl (struct dentry *dentry,struct inode *inode,struct inode *dir) +{ +struct posix_acl *acl =NULL ; +int ret =0 ; + +if (!S_ISLNK (inode->i_mode)) { +if (IS_POSIXACL (dir)) { + acl =ceph_get_acl (dir,ACL_TYPE_DEFAULT ); +if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + } + +if (!acl) + inode->i_mode &= ~current_umask (); + } + +if (IS_POSIXACL (dir) && acl) { +if (S_ISDIR (inode->i_mode)) { + ret =ceph_set_acl (dentry, inode, acl, +ACL_TYPE_DEFAULT ); +if (ret) + goto out_release; + } + ret =posix_acl_create (&acl,GFP_NOFS , &inode->i_mode); +if (ret <0 ) + goto out; +else if (ret >0 ) + ret =ceph_set_acl (dentry, inode, acl,ACL_TYPE_ACCESS ); +else +cache_no_acl (inode); + }else { +cache_no_acl (inode); + } + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +struct posix_acl *acl; +int ret =0 ; + +if (S_ISLNK (inode->i_mode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (!IS_POSIXACL (inode)) + goto out; + + acl =ceph_get_acl (inode,ACL_TYPE_ACCESS ); +if (IS_ERR_OR_NULL (acl)) { + ret =PTR_ERR (acl); + goto out; + } + + ret =posix_acl_chmod (&acl,GFP_KERNEL , inode->i_mode); +if (ret) + goto out; + ret =ceph_set_acl (dentry, inode, acl,ACL_TYPE_ACCESS ); +posix_acl_release (acl); +out: +return ret; +} + +static int ceph_xattr_acl_get (struct dentry *dentry,const char *name, +void *value,size_t size,int type) +{ +struct posix_acl *acl; +int ret =0 ; + +if (!IS_POSIXACL (dentry->d_inode)) +return -EOPNOTSUPP ; + + acl =ceph_get_acl (dentry->d_inode, type); +if (IS_ERR (acl)) +return PTR_ERR (acl); +if (acl ==NULL ) +return -ENODATA ; + + ret =posix_acl_to_xattr (&init_user_ns, acl, value, size); +posix_acl_release (acl); + +return ret; +} + +static int ceph_xattr_acl_set (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags,int type) +{ +int ret =0 ; +struct posix_acl *acl =NULL ; + +if (!inode_owner_or_capable (dentry->d_inode)) { + ret = -EPERM ; + goto out; + } + +if (!IS_POSIXACL (dentry->d_inode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (value) { + acl =posix_acl_from_xattr (&init_user_ns, value, size); +if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + +if (acl) { + ret =posix_acl_valid (acl); +if (ret) + goto out_release; + } + } + + ret =ceph_set_acl (dentry, dentry->d_inode, acl, type); + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +const struct xattr_handler ceph_xattr_acl_default_handler = { + .prefix =POSIX_ACL_XATTR_DEFAULT , + .flags =ACL_TYPE_DEFAULT , + .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +}; + +const struct xattr_handler ceph_xattr_acl_access_handler = { + .prefix =POSIX_ACL_XATTR_ACCESS , + .flags =ACL_TYPE_ACCESS , + .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +};fs/ceph/dir.c +5
-0@@ -693,6 +693,10 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,if (!err && !req->r_reply_info.head->is_dentry) err =ceph_handle_notrace_create (dir, dentry);ceph_mdsc_put_request (req); + +if (!err) + err =ceph_init_acl (dentry, dentry->d_inode, dir); +if (err)d_drop (dentry);return err;@@ -1293,6 +1297,7 @@ const struct inode_operations ceph_dir_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, .mknod = ceph_mknod, .symlink = ceph_symlink, .mkdir = ceph_mkdir,fs/ceph/inode.c +12
-1@@ -95,6 +95,7 @@ const struct inode_operations ceph_file_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };@@ -1632,6 +1633,7 @@ static const struct inode_operations ceph_symlink_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };/* @@ -1702,9 +1704,11 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr) attr->ia_mode);if (issued &CEPH_CAP_AUTH_EXCL ) { inode->i_mode = attr->ia_mode; - dirtied |=CEPH_CAP_AUTH_EXCL ; + dirtied |=CEPH_CAP_AUTH_EXCL |CEPH_CAP_XATTR_EXCL ; + ci->i_xattrs.dirty = true; }else if ((issued &CEPH_CAP_AUTH_SHARED ) ==0 || attr->ia_mode != inode->i_mode) { + inode->i_mode = attr->ia_mode; req->r_args.setattr.mode =cpu_to_le32 (attr->ia_mode); mask |=CEPH_SETATTR_MODE ; release |=CEPH_CAP_AUTH_SHARED ;@@ -1820,6 +1824,12 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)if (inode_dirty_flags)__mark_inode_dirty (inode, inode_dirty_flags); +if (ia_valid &ATTR_MODE ) { + err =ceph_acl_chmod (dentry, inode); +if (err) + goto out_put; + } +if (mask) { req->r_inode = inode;ihold (inode);@@ -1839,6 +1849,7 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)return err; out:spin_unlock (&ci->i_ceph_lock); +out_put:ceph_mdsc_put_request (req);return err; }fs/ceph/super.c +4
-0@@ -819,7 +819,11 @@ static int ceph_set_super(struct super_block *s, void *data) s->s_flags = fsc->mount_options->sb_flags; s->s_maxbytes =1ULL <<40 ;/* temp value until we get mdsmap */ +#ifdef CONFIG_CEPH_FS_POSIX_ACL + s->s_flags |=MS_POSIXACL ; +#endif + s->s_xattr = ceph_xattr_handlers; s->s_fs_info = fsc; fsc->sb = s;fs/ceph/super.h +31
-0@@ -725,6 +725,9 @@ extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry,/* xattr.c */ extern int ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +int __ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +ssize_t __ceph_getxattr (struct inode *,const char *,void *,size_t ); +int __ceph_removexattr (struct dentry *,const char *);extern ssize_t ceph_getxattr (struct dentry *,const char *,void *,size_t );extern ssize_t ceph_listxattr (struct dentry *,char *,size_t );extern int ceph_removexattr (struct dentry *,const char *);@@ -733,6 +736,34 @@ extern void __ceph_destroy_xattrs(struct ceph_inode_info *ci);extern void __init ceph_xattr_init (void );extern void ceph_xattr_exit (void ); +/* acl.c */ +extern const struct xattr_handler ceph_xattr_acl_access_handler; +extern const struct xattr_handler ceph_xattr_acl_default_handler; +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_init_acl (struct dentry *,struct inode *,struct inode *); +int ceph_acl_chmod (struct dentry *,struct inode *); + +#else + +#define ceph_get_acl NULL + +static inline int ceph_init_acl (struct dentry *dentry,struct inode *inode, +struct inode *dir) +{ +return 0 ; +} + +static inline int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +return 0 ; +} + +#endif +/* caps.c */ extern const char *ceph_cap_string (int c); extern void ceph_handle_caps(struct ceph_mds_session *session,fs/ceph/xattr.c +38
-12@@ -11,11 +11,24 @@#define XATTR_CEPH_PREFIX "ceph."#define XATTR_CEPH_PREFIX_LEN (sizeof (XATTR_CEPH_PREFIX) - 1) +/* +* List of handlers for synthetic system.* attributes. Other +* attributes are handled directly. +*/ +const struct xattr_handler *ceph_xattr_handlers[] = { +#ifdef CONFIG_CEPH_FS_POSIX_ACL + &ceph_xattr_acl_access_handler, + &ceph_xattr_acl_default_handler, +#endif +NULL , +}; +static bool ceph_is_valid_xattr (const char *name) {return !strncmp (name,XATTR_CEPH_PREFIX ,XATTR_CEPH_PREFIX_LEN ) || !strncmp (name,XATTR_SECURITY_PREFIX ,XATTR_SECURITY_PREFIX_LEN ) || + !strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN ) || !strncmp (name,XATTR_TRUSTED_PREFIX ,XATTR_TRUSTED_PREFIX_LEN ) || !strncmp (name,XATTR_USER_PREFIX ,XATTR_USER_PREFIX_LEN ); }@@ -663,10 +676,9 @@ void __ceph_build_xattrs_blob(struct ceph_inode_info *ci) } } -ssize_t ceph_getxattr (struct dentry *dentry,const char *name,void *value, +ssize_t __ceph_getxattr (struct inode *inode,const char *name,void *value,size_t size) { -struct inode *inode = dentry->d_inode;struct ceph_inode_info *ci =ceph_inode (inode);int err;struct ceph_inode_xattr *xattr;@@ -675,7 +687,6 @@ ssize_t ceph_getxattr(struct dentry *dentry, const char *name, void *value,if (!ceph_is_valid_xattr (name))return -ENODATA ; -/* let's see if a virtual xattr was requested */ vxattr =ceph_match_vxattr (inode, name);if (vxattr && !(vxattr->exists_cb && !vxattr->exists_cb (ci))) {@@ -725,6 +736,15 @@ out:return err; } +ssize_t ceph_getxattr (struct dentry *dentry,const char *name,void *value, +size_t size) +{ +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_getxattr (dentry, name, value, size); + +return __ceph_getxattr (dentry->d_inode, name, value, size); +} +ssize_t ceph_listxattr (struct dentry *dentry,char *names,size_t size) {struct inode *inode = dentry->d_inode;@@ -863,8 +883,8 @@ out:return err; } -int ceph_setxattr (struct dentry *dentry,const char *name, -const void *value,size_t size,int flags) +int __ceph_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;@@ -879,9 +899,6 @@ int ceph_setxattr(struct dentry *dentry, const char *name,struct ceph_inode_xattr *xattr =NULL ;int required_blob_size; -if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -958,6 +975,18 @@ out:return err; } +int ceph_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) +{ +if (ceph_snap (dentry->d_inode) !=CEPH_NOSNAP ) +return -EROFS ; + +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_setxattr (dentry, name, value, size, flags); + +return __ceph_setxattr (dentry, name, value, size, flags); +} +static int ceph_send_removexattr (struct dentry *dentry,const char *name) {struct ceph_fs_client *fsc =ceph_sb_to_client (dentry->d_sb);@@ -984,7 +1013,7 @@ static int ceph_send_removexattr(struct dentry *dentry, const char *name)return err; } -int ceph_removexattr (struct dentry *dentry,const char *name) +int __ceph_removexattr (struct dentry *dentry,const char *name) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;@@ -994,9 +1023,6 @@ int ceph_removexattr(struct dentry *dentry, const char *name)int required_blob_size;int dirty; -if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -1053,3 +1079,13 @@ out:return err; }Quoted 11 lines
fs/ceph/xattr.c out: · line 1091
Quoted 11 lines
fs/ceph/xattr.c +10
-0+int ceph_removexattr (struct dentry *dentry,const char *name) +{ +if (ceph_snap (dentry->d_inode) !=CEPH_NOSNAP ) +return -EROFS ; + +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_removexattr (dentry, name); + +return __ceph_removexattr (dentry, name); +}--
Best regards,
Guangliang
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi All,
We're interested in this too. Isn't there a cluster wide/server ACL representation component as well? In the Ganesha and linux-nfs communities, there has been a combined discussion with unification of ACLs for (eg) SMB, and hence Rich ACLs.
Regards,
Matt
Quoted 732 lines · ----- "Zheng Yan
Quoted 8 lines · Li Wang
Hi Li,
Thanks for your comments.
Quoted 2 lines
Hi,
I did not take a careful look at the code. But it seems to methat
Quoted 9 lines
Quoted 2 lines
for Ceph, the same directory could be mounted to different clients with totally different uid/gid, not aware of each other.
Cephfs is POSIX-compliant.
Quoted 2 lines
The ACL
won't make much sense and may not work properly.Authorization in ceph could do part of the job, however, we still
need ACL
Quoted 1 line
or something similar to. It could provide convenient privilege
management
Quoted 1 line
and fine-grained access control at the subdir and file level. There
may be
Quoted 3 lines
some bugs in view of the first version for reviewing actually.
I found this feature http://tracker.ceph.com/issues/27 when
answering your
Quoted 1 line
email and I think it is still valid even it was created several
years ago.
looks like glusterfs has ACL support, so no reason for ceph not to support
ACL. I'm a little busy this week, will review and test your patch next week.Regards
Yan, ZhengQuoted 10 lines
Quoted 10 lines · Guangliang Zhao
Quoted 7 lines
Add ACL support for cephfs, any comments are appreciated.
Signed-off-by Guangliang Zhao <[email protected]>--- fs/ceph/Kconfig | 13 +++ fs/ceph/Makefile | 1 + fs/ceph/acl.c | 286++++++++++++++++++++++++++++++++++++++++++++++++++++++
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
fs/ceph/dir.c | 5 + fs/ceph/inode.c | 13 ++- fs/ceph/super.c | 4 + fs/ceph/super.h | 31 ++++++ fs/ceph/xattr.c | 60 +++++++++--- 8 files changed, 400 insertions(+), 13 deletions(-) create mode 100644 fs/ceph/acl.cfs/ceph/Kconfig +0
-0@@ -25,3 +25,16 @@ config CEPH_FSCACHE caching support for Ceph clients using FS-CacheQuoted 8 lines
Quoted 8 lines
fs/ceph/Kconfig config CEPH_FSCACHE
Quoted 8 lines
fs/ceph/Kconfig +7
-0endif + +config CEPH_FS_POSIX_ACL + bool "Ceph POSIX Access Control Lists" + depends on CEPH_FS + select FS_POSIX_ACL + help + POSIX Access Control Lists (ACLs) support permissions forusers and
Quoted 3 lines
Quoted 3 lines
fs/ceph/Kconfig config CEPH_FSCACHE
Quoted 3 lines
fs/ceph/Kconfig +3
-0+ groups beyond the owner/group/world scheme. + + To learn more about Access Control Lists, visit the POSIXACLs for
Quoted 8 lines
Quoted 8 lines
fs/ceph/Makefile ceph-y := super.o inode.o dir.o file.o locks.o
Quoted 8 lines
fs/ceph/Kconfig +3
-0+ Linux website <http://acl.bestbits.at/>. + + If you don't know what Access Control Lists are, say Nfs/ceph/Makefile +0
-0@@ -10,3 +10,4 @@ ceph-y := super.o inode.o dir.o file.o locks.oaddr.o ioctl.o \
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
fs/ceph/Makefile +1
-0debugfs.o ceph-$(CONFIG_CEPH_FSCACHE) += cache.o +ceph-$(CONFIG_CEPH_FS_POSIX_ACL) += acl.ofs/ceph/acl.c new file +2
-0@@ -0,0 +1,286 @@ +/* +* linux/fs/ceph/acl.c Quoted 8 lines
Quoted 8 lines
fs/ceph/acl.c
Quoted 8 lines
fs/ceph/acl.c new file +8
-0+* +* Copyright (C) 2013 Guangliang Zhao, <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public +* License v2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful,
Quoted 1 line
Quoted 1 line
fs/ceph/acl.c line 11
Quoted 1 line
fs/ceph/acl.c new file +1
-0+* but WITHOUT ANY WARRANTY; without even the implied warranty of
Quoted 1 line
Quoted 1 line
fs/ceph/acl.c line 12
Quoted 1 line
fs/ceph/acl.c new file +1
-0+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Quoted 46 lines
Quoted 46 lines
Quoted 46 lines
fs/ceph/acl.c new file +46
-0+* General Public License for more details. +* +* You should have received a copy of the GNU General Public +* License along with this program; if not, write to the +* Free Software Foundation, Inc., 59 Temple Place - Suite 330, +* Boston, MA 021110-1307, USA. +*/ + +#include <linux/ceph/ceph_debug.h> +#include <linux/fs.h> +#include <linux/string.h> +#include <linux/xattr.h> +#include <linux/posix_acl_xattr.h> +#include <linux/posix_acl.h> +#include <linux/sched.h> +#include <linux/slab.h> + +#include "super.h" + +struct posix_acl *ceph_get_acl (struct inode *inode,int type) +{ +int size; +const char *name; +char *value =NULL ; +struct posix_acl *acl; + +if (!IS_POSIXACL (inode)) +return NULL ; + + acl =get_cached_acl (inode, type); +if (acl !=ACL_NOT_CACHED ) +return acl; + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +break ; +case ACL_TYPE_DEFAULT : + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : +BUG (); + } + + size =__ceph_getxattr (inode, name,"" ,0 ); +if (size >0 ) {Quoted 8 lines
Quoted 8 lines
fs/ceph/acl.c
Quoted 8 lines
fs/ceph/acl.c new file +8
-0+ value =kzalloc (size,GFP_NOFS ); +if (!value) +return ERR_PTR (-ENOMEM ); + size =__ceph_getxattr (inode, name, value, size); + } + +if (size >0 ) + acl = posix_acl_from_xattr(&init_user_ns, value,size);
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
fs/ceph/acl.c new file +6
-0+else if (size == -ERANGE || size == -ENODATA || size ==0 ) + acl =NULL ; +else + acl =ERR_PTR (-EIO ); + +kfree (value);Quoted 8 lines
Quoted 8 lines
fs/ceph/acl.c
Quoted 8 lines
fs/ceph/acl.c new file +8
-0+ +if (!IS_ERR (acl)) +set_cached_acl (inode, type, acl); + +return acl; +} + +static int ceph_set_acl(struct dentry *dentry, struct inode*inode,
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
fs/ceph/acl.c new file +9
-0+ struct posix_acl *acl, int type) +{ + int ret = 0, size = 0; +const char *name =NULL ; +char *value =NULL ; + +if (acl) { + ret =posix_acl_valid (acl); +if (ret <0 )Quoted 8 lines
Quoted 8 lines
fs/ceph/acl.c
Quoted 8 lines
fs/ceph/acl.c new file +8
-0+ goto out; + } + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +if (acl) { + ret = posix_acl_equiv_mode(acl,
&inode->i_mode);Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
fs/ceph/acl.c new file +19
-0+if (ret <0 ) + goto out; +if (ret ==0 ) + acl =NULL ; + } +break ; +case ACL_TYPE_DEFAULT : +if (!S_ISDIR (inode->i_mode)) { + ret = acl ? -EINVAL :0 ; + goto out; + } + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : + ret = -EINVAL ; + goto out; + } + +if (acl) {Quoted 8 lines
Quoted 8 lines
fs/ceph/acl.c
Quoted 8 lines
fs/ceph/acl.c new file +8
-0+ size =posix_acl_xattr_size (acl->a_count); + value =kmalloc (size,GFP_NOFS ); +if (!value) { + ret = -ENOMEM ; + goto out; + } + + ret = posix_acl_to_xattr(&init_user_ns, acl, value,size);
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
fs/ceph/acl.c new file +13
-0+if (ret <0 ) + goto out_free; + } + +if (value) + ret =__ceph_setxattr (dentry, name, value, size,0 ); +else + ret =__ceph_removexattr (dentry, name); + +if (ret) + goto out_free; + +set_cached_acl (inode, type, acl);Quoted 8 lines
Quoted 8 lines
fs/ceph/acl.c
Quoted 8 lines
fs/ceph/acl.c new file +8
-0+ +out_free: +kfree (value); +out: +return ret; +} + +int ceph_init_acl(struct dentry *dentry, struct inode *inode,struct inode *dir)
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
fs/ceph/acl.c new file +17
-0+{ +struct posix_acl *acl =NULL ; +int ret =0 ; + +if (!S_ISLNK (inode->i_mode)) { +if (IS_POSIXACL (dir)) { + acl =ceph_get_acl (dir,ACL_TYPE_DEFAULT ); +if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + } + +if (!acl) + inode->i_mode &= ~current_umask (); + } +Quoted 8 lines
Quoted 8 lines
fs/ceph/acl.c
Quoted 8 lines
fs/ceph/acl.c new file +8
-0+if (IS_POSIXACL (dir) && acl) { +if (S_ISDIR (inode->i_mode)) { + ret =ceph_set_acl (dentry, inode, acl, +ACL_TYPE_DEFAULT ); +if (ret) + goto out_release; + } + ret = posix_acl_create(&acl, GFP_NOFS,
&inode->i_mode);Quoted 4 lines
Quoted 4 lines
fs/ceph/acl.c
Quoted 4 lines
fs/ceph/acl.c new file +4
-0+if (ret <0 ) + goto out; +else if (ret >0 ) + ret = ceph_set_acl(dentry, inode, acl,
ACL_TYPE_ACCESS);Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
fs/ceph/acl.c new file +33
-0+else +cache_no_acl (inode); + }else { +cache_no_acl (inode); + } + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +struct posix_acl *acl; +int ret =0 ; + +if (S_ISLNK (inode->i_mode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (!IS_POSIXACL (inode)) + goto out; + + acl =ceph_get_acl (inode,ACL_TYPE_ACCESS ); +if (IS_ERR_OR_NULL (acl)) { + ret =PTR_ERR (acl); + goto out; + } + + ret =posix_acl_chmod (&acl,GFP_KERNEL , inode->i_mode); +if (ret)Quoted 8 lines
Quoted 8 lines
fs/ceph/acl.c
Quoted 8 lines
fs/ceph/acl.c new file +8
-0+ goto out; + ret =ceph_set_acl (dentry, inode, acl,ACL_TYPE_ACCESS ); +posix_acl_release (acl); +out: +return ret; +} + +static int ceph_xattr_acl_get(struct dentry *dentry, const char*name,
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
fs/ceph/acl.c new file +13
-0+ void *value, size_t size, int type) +{ +struct posix_acl *acl; +int ret =0 ; + +if (!IS_POSIXACL (dentry->d_inode)) +return -EOPNOTSUPP ; + + acl =ceph_get_acl (dentry->d_inode, type); +if (IS_ERR (acl)) +return PTR_ERR (acl); +if (acl ==NULL ) +return -ENODATA ;Quoted 8 lines
Quoted 8 lines
fs/ceph/acl.c
Quoted 8 lines
fs/ceph/acl.c new file +8
-0+ + ret =posix_acl_to_xattr (&init_user_ns, acl, value, size); +posix_acl_release (acl); + +return ret; +} + +static int ceph_xattr_acl_set(struct dentry *dentry, const char*name,
Quoted 1 line
Quoted 1 line
fs/ceph/acl.c line 237
Quoted 1 line
fs/ceph/acl.c new file +1
-0+ const void *value, size_t size, int flags,int type)
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
fs/ceph/acl.c new file +8
-0+{ +int ret =0 ; +struct posix_acl *acl =NULL ; + +if (!inode_owner_or_capable (dentry->d_inode)) { + ret = -EPERM ; + goto out; + }Quoted 8 lines
Quoted 8 lines
fs/ceph/acl.c
Quoted 8 lines
fs/ceph/acl.c new file +8
-0+ +if (!IS_POSIXACL (dentry->d_inode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (value) { + acl = posix_acl_from_xattr(&init_user_ns, value,size);
Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
fs/ceph/acl.c new file +30
-0+if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + +if (acl) { + ret =posix_acl_valid (acl); +if (ret) + goto out_release; + } + } + + ret =ceph_set_acl (dentry, dentry->d_inode, acl, type); + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +const struct xattr_handler ceph_xattr_acl_default_handler = { + .prefix =POSIX_ACL_XATTR_DEFAULT , + .flags =ACL_TYPE_DEFAULT , + .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +}; + +const struct xattr_handler ceph_xattr_acl_access_handler = { + .prefix =POSIX_ACL_XATTR_ACCESS , + .flags =ACL_TYPE_ACCESS ,Quoted 8 lines
Quoted 8 lines
fs/ceph/dir.c static int ceph_mknod(struct inode *dir,
Quoted 8 lines
fs/ceph/acl.c new file +3
-0+ .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +};fs/ceph/dir.c +0
-0@@ -693,6 +693,10 @@ static int ceph_mknod(struct inode *dir,struct dentry *dentry,
Quoted 11 lines
Quoted 11 lines
fs/ceph/dir.c const struct inode_operations ceph_dir_iops
Quoted 11 lines
fs/ceph/dir.c +4
-0if (!err && !req->r_reply_info.head->is_dentry) err =ceph_handle_notrace_create (dir, dentry);ceph_mdsc_put_request (req); + +if (!err) + err =ceph_init_acl (dentry, dentry->d_inode, dir); +if (err)d_drop (dentry);return err;@@ -1293,6 +1297,7 @@ const struct inode_operations ceph_dir_iops= {
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
fs/ceph/dir.c +1
-0.getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl,Quoted 8 lines
Quoted 8 lines
fs/ceph/inode.c const struct inode_operations ceph_file_iops =
Quoted 8 lines
fs/ceph/dir.c +0
-0.mknod = ceph_mknod, .symlink = ceph_symlink, .mkdir = ceph_mkdir,fs/ceph/inode.c +0
-0@@ -95,6 +95,7 @@ const struct inode_operations ceph_file_iops ={
Quoted 8 lines
Quoted 8 lines
fs/ceph/inode.c static const struct inode_operations
Quoted 8 lines
fs/ceph/inode.c +1
-0.getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };@@ -1632,6 +1633,7 @@ static const struct inode_operations
ceph_symlink_iops= {Quoted 8 lines
Quoted 8 lines
fs/ceph/inode.c int ceph_setattr(struct dentry *dentry,
Quoted 8 lines
fs/ceph/inode.c +1
-0.getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };/* @@ -1702,9 +1704,11 @@ int ceph_setattr(struct dentry *dentry,struct iattr *attr)
Quoted 5 lines
Quoted 5 lines
fs/ceph/inode.c int ceph_setattr(struct dentry *dentry, struct iattr *attr)
Quoted 5 lines
fs/ceph/inode.c +1
-1attr->ia_mode);if (issued &CEPH_CAP_AUTH_EXCL ) { inode->i_mode = attr->ia_mode; - dirtied |=CEPH_CAP_AUTH_EXCL ; + dirtied |= CEPH_CAP_AUTH_EXCL |
CEPH_CAP_XATTR_EXCL;Quoted 5 lines
Quoted 5 lines
fs/ceph/inode.c int ceph_setattr(struct dentry *dentry, struct iattr *attr)
Quoted 5 lines
fs/ceph/inode.c +2
-0+ ci->i_xattrs.dirty = true; }else if ((issued &CEPH_CAP_AUTH_SHARED ) ==0 || attr->ia_mode != inode->i_mode) { + inode->i_mode = attr->ia_mode; req->r_args.setattr.mode =
cpu_to_le32(attr->ia_mode);Quoted 3 lines
Quoted 3 lines
fs/ceph/inode.c int ceph_setattr(struct dentry *dentry,
Quoted 3 lines
fs/ceph/inode.c +0
-0mask |=CEPH_SETATTR_MODE ; release |=CEPH_CAP_AUTH_SHARED ;@@ -1820,6 +1824,12 @@ int ceph_setattr(struct dentry *dentry,struct iattr *attr)
Quoted 13 lines
Quoted 13 lines
fs/ceph/inode.c int ceph_setattr(struct dentry *dentry,
Quoted 13 lines
fs/ceph/inode.c +6
-0if (inode_dirty_flags)__mark_inode_dirty (inode, inode_dirty_flags); +if (ia_valid &ATTR_MODE ) { + err =ceph_acl_chmod (dentry, inode); +if (err) + goto out_put; + } +if (mask) { req->r_inode = inode;ihold (inode);@@ -1839,6 +1849,7 @@ int ceph_setattr(struct dentry *dentry,struct iattr *attr)
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
fs/ceph/inode.c +1
-0return err; out:spin_unlock (&ci->i_ceph_lock); +out_put:Quoted 8 lines
Quoted 8 lines
fs/ceph/super.c static int ceph_set_super(struct super_block
Quoted 8 lines
fs/ceph/inode.c +0
-0ceph_mdsc_put_request (req);return err; }fs/ceph/super.c +0
-0@@ -819,7 +819,11 @@ static int ceph_set_super(struct super_block*s, void *data)
Quoted 3 lines
Quoted 3 lines
fs/ceph/super.c static int ceph_set_super(struct super_block · line 820
Quoted 3 lines
fs/ceph/super.c +0
-0s->s_flags = fsc->mount_options->sb_flags; s->s_maxbytes =1ULL <<40 ;/* temp value until we get mdsmap */
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
fs/ceph/super.c +4
-0+#ifdef CONFIG_CEPH_FS_POSIX_ACL + s->s_flags |=MS_POSIXACL ; +#endif + s->s_xattr = ceph_xattr_handlers; s->s_fs_info = fsc; fsc->sb = s;Quoted 5 lines
Quoted 5 lines
fs/ceph/super.h extern int ceph_getattr(struct vfsmount *mnt,
Quoted 5 lines
fs/ceph/super.h +0
-0@@ -725,6 +725,9 @@ extern int ceph_getattr(struct vfsmount *mnt,struct dentry *dentry,
Quoted 2 lines
Quoted 2 lines
fs/ceph/super.h extern int ceph_getattr(struct vfsmount *mnt, · line 726
Quoted 2 lines
fs/ceph/super.h +0
-0/* xattr.c */ extern int ceph_setxattr(struct dentry *, const char *, constvoid *,
Quoted 2 lines
Quoted 2 lines
fs/ceph/super.h extern int ceph_getattr(struct vfsmount *mnt, · line 728
Quoted 2 lines
fs/ceph/super.h +1
-0size_t, int); +int __ceph_setxattr(struct dentry *, const char *, const void *,
size_t, int);Quoted 1 line
Quoted 1 line
fs/ceph/super.h extern int ceph_getattr(struct vfsmount *mnt, · line 729
Quoted 1 line
fs/ceph/super.h +1
-0+ssize_t __ceph_getxattr(struct inode *, const char *, void *,
size_t);Quoted 2 lines
Quoted 2 lines
fs/ceph/super.h extern int ceph_getattr(struct vfsmount *mnt, · line 731
Quoted 2 lines
fs/ceph/super.h +1
-0+int __ceph_removexattr (struct dentry *,const char *); extern ssize_t ceph_getxattr(struct dentry *, const char *, void*,
size_t);Quoted 3 lines
Quoted 3 lines
fs/ceph/super.h extern void __ceph_destroy_xattrs(struct
Quoted 3 lines
fs/ceph/super.h +0
-0extern ssize_t ceph_listxattr (struct dentry *,char *,size_t );extern int ceph_removexattr (struct dentry *,const char *);@@ -733,6 +736,34 @@ extern void __ceph_destroy_xattrs(struct
ceph_inode_info*ci);Quoted 6 lines
Quoted 6 lines
fs/ceph/super.h extern void __ceph_destroy_xattrs(struct ceph_inode_info *ci);
Quoted 6 lines
fs/ceph/super.h +3
-0extern void __init ceph_xattr_init (void );extern void ceph_xattr_exit (void ); +/* acl.c */ +extern const struct xattr_handler ceph_xattr_acl_access_handler; +extern const struct xattr_handler
ceph_xattr_acl_default_handler;Quoted 6 lines
Quoted 6 lines
fs/ceph/super.h extern void __ceph_destroy_xattrs(struct ceph_inode_info *ci);
Quoted 6 lines
fs/ceph/super.h +6
-0+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_init_acl(struct dentry *, struct inode *, struct inode*);
Quoted 7 lines
Quoted 7 lines
fs/ceph/super.h extern void __ceph_destroy_xattrs(struct ceph_inode_info *ci);
Quoted 7 lines
fs/ceph/super.h +7
-0+int ceph_acl_chmod (struct dentry *,struct inode *); + +#else + +#define ceph_get_acl NULL + +static inline int ceph_init_acl(struct dentry *dentry, structinode *inode,
Quoted 6 lines
Quoted 6 lines
fs/ceph/super.h extern void __ceph_destroy_xattrs(struct ceph_inode_info *ci);
Quoted 6 lines
fs/ceph/super.h +6
-0+ struct inode *dir) +{ +return 0 ; +} + +static inline int ceph_acl_chmod(struct dentry *dentry, structinode *inode)
Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
fs/ceph/super.h +6
-0+{ +return 0 ; +} + +#endif +/* caps.c */ extern const char *ceph_cap_string (int c); extern void ceph_handle_caps(struct ceph_mds_session *session,fs/ceph/xattr.c +0
-0@@ -11,11 +11,24 @@#define XATTR_CEPH_PREFIX "ceph."#define XATTR_CEPH_PREFIX_LEN (sizeof (XATTR_CEPH_PREFIX) - 1)Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
fs/ceph/xattr.c +7
-0+/* +* List of handlers for synthetic system.* attributes. Other +* attributes are handled directly. +*/ +const struct xattr_handler *ceph_xattr_handlers[] = { +#ifdef CONFIG_CEPH_FS_POSIX_ACL + &ceph_xattr_acl_access_handler,Quoted 8 lines
fs/ceph/xattr.c
Quoted 8 lines
fs/ceph/xattr.c +5
-0+ &ceph_xattr_acl_default_handler, +#endif + NULL, +}; +static bool ceph_is_valid_xattr (const char *name) { return !strncmp(name, XATTR_CEPH_PREFIX,
XATTR_CEPH_PREFIX_LEN) ||Quoted 3 lines
Quoted 3 lines
fs/ceph/xattr.c
Quoted 3 lines
fs/ceph/xattr.c +1
-0!strncmp (name,XATTR_SECURITY_PREFIX ,XATTR_SECURITY_PREFIX_LEN ) || + !strncmp(name, XATTR_SYSTEM_PREFIX,
XATTR_SYSTEM_PREFIX_LEN) ||Quoted 1 line
Quoted 1 line
fs/ceph/xattr.c line 32
Quoted 1 line
fs/ceph/xattr.c +0
-0!strncmp(name, XATTR_TRUSTED_PREFIX,
XATTR_TRUSTED_PREFIX_LEN) ||Quoted 1 line
Quoted 1 line
fs/ceph/xattr.c line 33
Quoted 1 line
fs/ceph/xattr.c +0
-0!strncmp(name, XATTR_USER_PREFIX,
XATTR_USER_PREFIX_LEN);Quoted 2 lines
Quoted 2 lines
fs/ceph/xattr.c void __ceph_build_xattrs_blob(struct
Quoted 2 lines
fs/ceph/xattr.c +0
-0}@@ -663,10 +676,9 @@ void __ceph_build_xattrs_blob(struct
ceph_inode_info*ci)Quoted 4 lines
Quoted 4 lines
fs/ceph/xattr.c void __ceph_build_xattrs_blob(struct · line 666
Quoted 4 lines
fs/ceph/xattr.c +0
-1} } -ssize_t ceph_getxattr(struct dentry *dentry, const char *name,void *value,
Quoted 1 line
Quoted 1 line
fs/ceph/xattr.c void __ceph_build_xattrs_blob(struct · line 679
Quoted 1 line
fs/ceph/xattr.c +1
-0+ssize_t __ceph_getxattr(struct inode *inode, const char *name,void *value,
Quoted 7 lines
Quoted 7 lines
fs/ceph/xattr.c ssize_t ceph_getxattr(struct dentry *dentry,
Quoted 7 lines
fs/ceph/xattr.c +0
-1size_t size) { -struct inode *inode = dentry->d_inode;struct ceph_inode_info *ci =ceph_inode (inode);int err;struct ceph_inode_xattr *xattr;@@ -675,7 +687,6 @@ ssize_t ceph_getxattr(struct dentry *dentry,const char *name, void *value,
Quoted 7 lines
Quoted 7 lines
fs/ceph/xattr.c ssize_t ceph_getxattr(struct dentry *dentry, const char *name, void *value,
Quoted 7 lines
fs/ceph/xattr.c +0
-1if (!ceph_is_valid_xattr (name))return -ENODATA ; -/* let's see if a virtual xattr was requested */ vxattr =ceph_match_vxattr (inode, name);if (vxattr && !(vxattr->exists_cb && !vxattr->exists_cb (ci))){
Quoted 5 lines
Quoted 5 lines
fs/ceph/xattr.c out: · line 739
Quoted 5 lines
fs/ceph/xattr.c +1
-0@@ -725,6 +736,15 @@ out:return err; } +ssize_t ceph_getxattr(struct dentry *dentry, const char *name,void *value,
Quoted 3 lines
Quoted 3 lines
fs/ceph/xattr.c out:
Quoted 3 lines
fs/ceph/xattr.c +3
-0+ size_t size) +{ + if (!strncmp(name, XATTR_SYSTEM_PREFIX,
XATTR_SYSTEM_PREFIX_LEN))Quoted 6 lines
Quoted 6 lines
fs/ceph/xattr.c out:
Quoted 6 lines
fs/ceph/xattr.c +5
-0+return generic_getxattr (dentry, name, value, size); + +return __ceph_getxattr (dentry->d_inode, name, value, size); +} + ssize_t ceph_listxattr(struct dentry *dentry, char *names,
size_tsize)Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
fs/ceph/xattr.c +0
-0{struct inode *inode = dentry->d_inode;@@ -863,8 +883,8 @@ out:return err; }Quoted 8 lines
Quoted 8 lines
fs/ceph/xattr.c int ceph_setxattr(struct dentry *dentry, const
Quoted 8 lines
fs/ceph/xattr.c +2
-2-int ceph_setxattr (struct dentry *dentry,const char *name, -const void *value,size_t size,int flags) +int __ceph_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;@@ -879,9 +899,6 @@ int ceph_setxattr(struct dentry *dentry, constchar *name,
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
fs/ceph/xattr.c +0
-3struct ceph_inode_xattr *xattr =NULL ;int required_blob_size; -if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -958,6 +975,18 @@ out:return err; }Quoted 7 lines
Quoted 7 lines
fs/ceph/xattr.c out:
Quoted 7 lines
fs/ceph/xattr.c +7
-0+int ceph_setxattr(struct dentry *dentry, const char *name, + const void *value, size_t size, int flags) +{ + if (ceph_snap(dentry->d_inode) != CEPH_NOSNAP) + return -EROFS; + + if (!strncmp(name, XATTR_SYSTEM_PREFIX,
XATTR_SYSTEM_PREFIX_LEN))Quoted 1 line
Quoted 1 line
fs/ceph/xattr.c out: · line 985
Quoted 1 line
fs/ceph/xattr.c +1
-0+ return generic_setxattr(dentry, name, value, size,flags);
Quoted 5 lines
Quoted 5 lines
fs/ceph/xattr.c out:
Quoted 5 lines
fs/ceph/xattr.c +4
-0+ +return __ceph_setxattr (dentry, name, value, size, flags); +} + static int ceph_send_removexattr(struct dentry *dentry, constchar *name)
Quoted 2 lines
Quoted 2 lines
fs/ceph/xattr.c out: · line 992
Quoted 2 lines
fs/ceph/xattr.c +0
-0{ struct ceph_fs_client *fsc =
ceph_sb_to_client(dentry->d_sb);Quoted 1 line
Quoted 1 line
fs/ceph/xattr.c static int ceph_send_removexattr(struct
Quoted 1 line
fs/ceph/xattr.c +0
-0@@ -984,7 +1013,7 @@ static int ceph_send_removexattr(structdentry *dentry, const char *name)
Quoted 9 lines
Quoted 9 lines
fs/ceph/xattr.c int ceph_removexattr(struct dentry *dentry,
Quoted 9 lines
fs/ceph/xattr.c +1
-1return err; } -int ceph_removexattr (struct dentry *dentry,const char *name) +int __ceph_removexattr (struct dentry *dentry,const char *name) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;@@ -994,9 +1023,6 @@ int ceph_removexattr(struct dentry *dentry,const char *name)
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
fs/ceph/xattr.c +0
-3int required_blob_size;int dirty; -if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -1053,3 +1079,13 @@ out:return err; }Quoted 6 lines
Quoted 6 lines
fs/ceph/xattr.c out:
Quoted 6 lines
fs/ceph/xattr.c +6
-0+int ceph_removexattr(struct dentry *dentry, const char *name) +{ + if (ceph_snap(dentry->d_inode) != CEPH_NOSNAP) + return -EROFS; + + if (!strncmp(name, XATTR_SYSTEM_PREFIX,
XATTR_SYSTEM_PREFIX_LEN))Quoted 11 lines
Quoted 5 lines
fs/ceph/xattr.c out: · line 1091
Quoted 5 lines
fs/ceph/xattr.c +4
-0+return generic_removexattr (dentry, name); + +return __ceph_removexattr (dentry, name); +}--
Best regards,
Guangliang
--
To unsubscribe from this list: send the line "unsubscribeceph-devel" in
Quoted 2 lines
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 10 lines
Matt Benjamin The Linux Box 206 South Fifth Ave. Suite 150 Ann Arbor, MI 48104 http://linuxbox.com tel. 734-761-4689 fax. 734-769-8938 cel. 734-216-5309
Isn't the UID/GID mismatch a generic problem when using CephFS? ;)
I've got this patch in my queue as well if nobody else beats me to it. -Greg
Software Engineer #42 @ http://inktank.com | http://ceph.com
Quoted 5 lines · Li Wang
Hi,
I did not take a careful look at the code. But it seems to me that for
Ceph, the same directory could be mounted to different clients with totally different uid/gid, not aware of each other. The ACL won't make much sense and may not work properly.
Quoted 383 lines · Guangliang Zhao
Add ACL support for cephfs, any comments are appreciated.
Signed-off-by Guangliang Zhao <[email protected]>--- fs/ceph/Kconfig | 13 +++ fs/ceph/Makefile | 1 + fs/ceph/acl.c | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ceph/dir.c | 5 + fs/ceph/inode.c | 13 ++- fs/ceph/super.c | 4 + fs/ceph/super.h | 31 ++++++ fs/ceph/xattr.c | 60 +++++++++--- 8 files changed, 400 insertions(+), 13 deletions(-) create mode 100644 fs/ceph/acl.cfs/ceph/Kconfig +13
-0@@ -25,3 +25,16 @@ config CEPH_FSCACHE caching support for Ceph clients using FS-Cache endif + +config CEPH_FS_POSIX_ACL + bool "Ceph POSIX Access Control Lists" + depends on CEPH_FS + select FS_POSIX_ACL + help + POSIX Access Control Lists (ACLs) support permissions for users and + groups beyond the owner/group/world scheme. + + To learn more about Access Control Lists, visit the POSIX ACLs for + Linux website <http://acl.bestbits.at/>. + + If you don't know what Access Control Lists are, say Nfs/ceph/Makefile +1
-0@@ -10,3 +10,4 @@ ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ debugfs.o ceph-$(CONFIG_CEPH_FSCACHE) += cache.o +ceph-$(CONFIG_CEPH_FS_POSIX_ACL) += acl.ofs/ceph/acl.c new file +286
-0@@ -0,0 +1,286 @@ +/* +* linux/fs/ceph/acl.c +* +* Copyright (C) 2013 Guangliang Zhao, <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public +* License v2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public +* License along with this program; if not, write to the +* Free Software Foundation, Inc., 59 Temple Place - Suite 330, +* Boston, MA 021110-1307, USA. +*/ + +#include <linux/ceph/ceph_debug.h> +#include <linux/fs.h> +#include <linux/string.h> +#include <linux/xattr.h> +#include <linux/posix_acl_xattr.h> +#include <linux/posix_acl.h> +#include <linux/sched.h> +#include <linux/slab.h> + +#include "super.h" + +struct posix_acl *ceph_get_acl (struct inode *inode,int type) +{ +int size; +const char *name; +char *value =NULL ; +struct posix_acl *acl; + +if (!IS_POSIXACL (inode)) +return NULL ; + + acl =get_cached_acl (inode, type); +if (acl !=ACL_NOT_CACHED ) +return acl; + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +break ; +case ACL_TYPE_DEFAULT : + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : +BUG (); + } + + size =__ceph_getxattr (inode, name,"" ,0 ); +if (size >0 ) { + value =kzalloc (size,GFP_NOFS ); +if (!value) +return ERR_PTR (-ENOMEM ); + size =__ceph_getxattr (inode, name, value, size); + } + +if (size >0 ) + acl =posix_acl_from_xattr (&init_user_ns, value, size); +else if (size == -ERANGE || size == -ENODATA || size ==0 ) + acl =NULL ; +else + acl =ERR_PTR (-EIO ); + +kfree (value); + +if (!IS_ERR (acl)) +set_cached_acl (inode, type, acl); + +return acl; +} + +static int ceph_set_acl (struct dentry *dentry,struct inode *inode, +struct posix_acl *acl,int type) +{ +int ret =0 , size =0 ; +const char *name =NULL ; +char *value =NULL ; + +if (acl) { + ret =posix_acl_valid (acl); +if (ret <0 ) + goto out; + } + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +if (acl) { + ret =posix_acl_equiv_mode (acl, &inode->i_mode); +if (ret <0 ) + goto out; +if (ret ==0 ) + acl =NULL ; + } +break ; +case ACL_TYPE_DEFAULT : +if (!S_ISDIR (inode->i_mode)) { + ret = acl ? -EINVAL :0 ; + goto out; + } + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : + ret = -EINVAL ; + goto out; + } + +if (acl) { + size =posix_acl_xattr_size (acl->a_count); + value =kmalloc (size,GFP_NOFS ); +if (!value) { + ret = -ENOMEM ; + goto out; + } + + ret =posix_acl_to_xattr (&init_user_ns, acl, value, size); +if (ret <0 ) + goto out_free; + } + +if (value) + ret =__ceph_setxattr (dentry, name, value, size,0 ); +else + ret =__ceph_removexattr (dentry, name); + +if (ret) + goto out_free; + +set_cached_acl (inode, type, acl); + +out_free: +kfree (value); +out: +return ret; +} + +int ceph_init_acl (struct dentry *dentry,struct inode *inode,struct inode *dir) +{ +struct posix_acl *acl =NULL ; +int ret =0 ; + +if (!S_ISLNK (inode->i_mode)) { +if (IS_POSIXACL (dir)) { + acl =ceph_get_acl (dir,ACL_TYPE_DEFAULT ); +if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + } + +if (!acl) + inode->i_mode &= ~current_umask (); + } + +if (IS_POSIXACL (dir) && acl) { +if (S_ISDIR (inode->i_mode)) { + ret =ceph_set_acl (dentry, inode, acl, +ACL_TYPE_DEFAULT ); +if (ret) + goto out_release; + } + ret =posix_acl_create (&acl,GFP_NOFS , &inode->i_mode); +if (ret <0 ) + goto out; +else if (ret >0 ) + ret =ceph_set_acl (dentry, inode, acl,ACL_TYPE_ACCESS ); +else +cache_no_acl (inode); + }else { +cache_no_acl (inode); + } + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +struct posix_acl *acl; +int ret =0 ; + +if (S_ISLNK (inode->i_mode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (!IS_POSIXACL (inode)) + goto out; + + acl =ceph_get_acl (inode,ACL_TYPE_ACCESS ); +if (IS_ERR_OR_NULL (acl)) { + ret =PTR_ERR (acl); + goto out; + } + + ret =posix_acl_chmod (&acl,GFP_KERNEL , inode->i_mode); +if (ret) + goto out; + ret =ceph_set_acl (dentry, inode, acl,ACL_TYPE_ACCESS ); +posix_acl_release (acl); +out: +return ret; +} + +static int ceph_xattr_acl_get (struct dentry *dentry,const char *name, +void *value,size_t size,int type) +{ +struct posix_acl *acl; +int ret =0 ; + +if (!IS_POSIXACL (dentry->d_inode)) +return -EOPNOTSUPP ; + + acl =ceph_get_acl (dentry->d_inode, type); +if (IS_ERR (acl)) +return PTR_ERR (acl); +if (acl ==NULL ) +return -ENODATA ; + + ret =posix_acl_to_xattr (&init_user_ns, acl, value, size); +posix_acl_release (acl); + +return ret; +} + +static int ceph_xattr_acl_set (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags,int type) +{ +int ret =0 ; +struct posix_acl *acl =NULL ; + +if (!inode_owner_or_capable (dentry->d_inode)) { + ret = -EPERM ; + goto out; + } + +if (!IS_POSIXACL (dentry->d_inode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (value) { + acl =posix_acl_from_xattr (&init_user_ns, value, size); +if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + +if (acl) { + ret =posix_acl_valid (acl); +if (ret) + goto out_release; + } + } + + ret =ceph_set_acl (dentry, dentry->d_inode, acl, type); + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +const struct xattr_handler ceph_xattr_acl_default_handler = { + .prefix =POSIX_ACL_XATTR_DEFAULT , + .flags =ACL_TYPE_DEFAULT , + .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +}; + +const struct xattr_handler ceph_xattr_acl_access_handler = { + .prefix =POSIX_ACL_XATTR_ACCESS , + .flags =ACL_TYPE_ACCESS , + .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +};fs/ceph/dir.c +5
-0@@ -693,6 +693,10 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,if (!err && !req->r_reply_info.head->is_dentry) err =ceph_handle_notrace_create (dir, dentry);ceph_mdsc_put_request (req); + +if (!err) + err =ceph_init_acl (dentry, dentry->d_inode, dir); +if (err)d_drop (dentry);return err;@@ -1293,6 +1297,7 @@ const struct inode_operations ceph_dir_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, .mknod = ceph_mknod, .symlink = ceph_symlink, .mkdir = ceph_mkdir,fs/ceph/inode.c +2
-0@@ -95,6 +95,7 @@ const struct inode_operations ceph_file_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };@@ -1632,6 +1633,7 @@ static const struct inode_operations ceph_symlink_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };/* @@ -1702,9 +1704,11 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr) attr->ia_mode);if (issued &CEPH_CAP_AUTH_EXCL ) {
fs/ceph/inode.c int ceph_setattr(struct dentry *dentry, struct iattr *attr) · line 1714
Quoted 10 lines
fs/ceph/inode.c +3
-1inode->i_mode = attr->ia_mode; - dirtied |=CEPH_CAP_AUTH_EXCL ; + dirtied |=CEPH_CAP_AUTH_EXCL |CEPH_CAP_XATTR_EXCL ; + ci->i_xattrs.dirty = true; }else if ((issued &CEPH_CAP_AUTH_SHARED ) ==0 || attr->ia_mode != inode->i_mode) { + inode->i_mode = attr->ia_mode; req->r_args.setattr.mode =cpu_to_le32 (attr->ia_mode); mask |=CEPH_SETATTR_MODE ; release |=CEPH_CAP_AUTH_SHARED ;
I think these changes are not needed. ceph_acl_chmod() below will handle the xattr
change.
Quoted 163 lines
fs/ceph/inode.c +7
-0@@ -1820,6 +1824,12 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)if (inode_dirty_flags)__mark_inode_dirty (inode, inode_dirty_flags); +if (ia_valid &ATTR_MODE ) { + err =ceph_acl_chmod (dentry, inode); +if (err) + goto out_put; + } +if (mask) { req->r_inode = inode;ihold (inode);@@ -1839,6 +1849,7 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)return err; out:spin_unlock (&ci->i_ceph_lock); +out_put:ceph_mdsc_put_request (req);return err; }fs/ceph/super.c +4
-0@@ -819,7 +819,11 @@ static int ceph_set_super(struct super_block *s, void *data) s->s_flags = fsc->mount_options->sb_flags; s->s_maxbytes =1ULL <<40 ;/* temp value until we get mdsmap */ +#ifdef CONFIG_CEPH_FS_POSIX_ACL + s->s_flags |=MS_POSIXACL ; +#endif + s->s_xattr = ceph_xattr_handlers; s->s_fs_info = fsc; fsc->sb = s;fs/ceph/super.h +31
-0@@ -725,6 +725,9 @@ extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry,/* xattr.c */ extern int ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +int __ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +ssize_t __ceph_getxattr (struct inode *,const char *,void *,size_t ); +int __ceph_removexattr (struct dentry *,const char *);extern ssize_t ceph_getxattr (struct dentry *,const char *,void *,size_t );extern ssize_t ceph_listxattr (struct dentry *,char *,size_t );extern int ceph_removexattr (struct dentry *,const char *);@@ -733,6 +736,34 @@ extern void __ceph_destroy_xattrs(struct ceph_inode_info *ci);extern void __init ceph_xattr_init (void );extern void ceph_xattr_exit (void ); +/* acl.c */ +extern const struct xattr_handler ceph_xattr_acl_access_handler; +extern const struct xattr_handler ceph_xattr_acl_default_handler; +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_init_acl (struct dentry *,struct inode *,struct inode *); +int ceph_acl_chmod (struct dentry *,struct inode *); + +#else + +#define ceph_get_acl NULL + +static inline int ceph_init_acl (struct dentry *dentry,struct inode *inode, +struct inode *dir) +{ +return 0 ; +} + +static inline int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +return 0 ; +} + +#endif +/* caps.c */ extern const char *ceph_cap_string (int c); extern void ceph_handle_caps(struct ceph_mds_session *session,fs/ceph/xattr.c +25
-5@@ -11,11 +11,24 @@#define XATTR_CEPH_PREFIX "ceph."#define XATTR_CEPH_PREFIX_LEN (sizeof (XATTR_CEPH_PREFIX) - 1) +/* +* List of handlers for synthetic system.* attributes. Other +* attributes are handled directly. +*/ +const struct xattr_handler *ceph_xattr_handlers[] = { +#ifdef CONFIG_CEPH_FS_POSIX_ACL + &ceph_xattr_acl_access_handler, + &ceph_xattr_acl_default_handler, +#endif +NULL , +}; +static bool ceph_is_valid_xattr (const char *name) {return !strncmp (name,XATTR_CEPH_PREFIX ,XATTR_CEPH_PREFIX_LEN ) || !strncmp (name,XATTR_SECURITY_PREFIX ,XATTR_SECURITY_PREFIX_LEN ) || + !strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN ) || !strncmp (name,XATTR_TRUSTED_PREFIX ,XATTR_TRUSTED_PREFIX_LEN ) || !strncmp (name,XATTR_USER_PREFIX ,XATTR_USER_PREFIX_LEN ); }@@ -663,10 +676,9 @@ void __ceph_build_xattrs_blob(struct ceph_inode_info *ci) } } -ssize_t ceph_getxattr (struct dentry *dentry,const char *name,void *value, +ssize_t __ceph_getxattr (struct inode *inode,const char *name,void *value,size_t size) { -struct inode *inode = dentry->d_inode;struct ceph_inode_info *ci =ceph_inode (inode);int err;struct ceph_inode_xattr *xattr;@@ -675,7 +687,6 @@ ssize_t ceph_getxattr(struct dentry *dentry, const char *name, void *value,if (!ceph_is_valid_xattr (name))return -ENODATA ; -/* let's see if a virtual xattr was requested */ vxattr =ceph_match_vxattr (inode, name);if (vxattr && !(vxattr->exists_cb && !vxattr->exists_cb (ci))) {@@ -725,6 +736,15 @@ out:return err; } +ssize_t ceph_getxattr (struct dentry *dentry,const char *name,void *value, +size_t size) +{ +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_getxattr (dentry, name, value, size); + +return __ceph_getxattr (dentry->d_inode, name, value, size); +} +ssize_t ceph_listxattr (struct dentry *dentry,char *names,size_t size) {struct inode *inode = dentry->d_inode;@@ -863,8 +883,8 @@ out:return err; } -int ceph_setxattr (struct dentry *dentry,const char *name, -const void *value,size_t size,int flags) +int __ceph_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;
fs/ceph/xattr.c int ceph_setxattr(struct dentry *dentry, const char *name, · line 884
Quoted 6 lines
fs/ceph/xattr.c +0
-3@@ -879,9 +899,6 @@ int ceph_setxattr(struct dentry *dentry, const char *name,struct ceph_inode_xattr *xattr =NULL ;int required_blob_size; -if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -
why remove this ?
Quoted 32 lines
fs/ceph/xattr.c +13
-1if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -958,6 +975,18 @@ out:return err; } +int ceph_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) +{ +if (ceph_snap (dentry->d_inode) !=CEPH_NOSNAP ) +return -EROFS ; + +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_setxattr (dentry, name, value, size, flags); + +return __ceph_setxattr (dentry, name, value, size, flags); +} +static int ceph_send_removexattr (struct dentry *dentry,const char *name) {struct ceph_fs_client *fsc =ceph_sb_to_client (dentry->d_sb);@@ -984,7 +1013,7 @@ static int ceph_send_removexattr(struct dentry *dentry, const char *name)return err; } -int ceph_removexattr (struct dentry *dentry,const char *name) +int __ceph_removexattr (struct dentry *dentry,const char *name) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;
fs/ceph/xattr.c int ceph_removexattr(struct dentry *dentry, const char *name) · line 999
Quoted 6 lines
fs/ceph/xattr.c +0
-3@@ -994,9 +1023,6 @@ int ceph_removexattr(struct dentry *dentry, const char *name)int required_blob_size;int dirty; -if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -
??
Regards
Yan, Zheng
Quoted 17 lines
fs/ceph/xattr.c +10
-0if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -1053,3 +1079,13 @@ out:return err; } +int ceph_removexattr (struct dentry *dentry,const char *name) +{ +if (ceph_snap (dentry->d_inode) !=CEPH_NOSNAP ) +return -EROFS ; + +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_removexattr (dentry, name); + +return __ceph_removexattr (dentry, name); +}
Quoted 1 line · Zheng
On Thu, Oct 17, 2013 at 4:27 PM, Guangliang Zhao <[email protected]> wrote:
Hi Yan,
Thanks for your reviewing.
Quoted 389 lines
Quoted 389 lines
Add ACL support for cephfs, any comments are appreciated.
Signed-off-by Guangliang Zhao <[email protected]>--- fs/ceph/Kconfig | 13 +++ fs/ceph/Makefile | 1 + fs/ceph/acl.c | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ceph/dir.c | 5 + fs/ceph/inode.c | 13 ++- fs/ceph/super.c | 4 + fs/ceph/super.h | 31 ++++++ fs/ceph/xattr.c | 60 +++++++++--- 8 files changed, 400 insertions(+), 13 deletions(-) create mode 100644 fs/ceph/acl.cfs/ceph/Kconfig +13
-0@@ -25,3 +25,16 @@ config CEPH_FSCACHE caching support for Ceph clients using FS-Cache endif + +config CEPH_FS_POSIX_ACL + bool "Ceph POSIX Access Control Lists" + depends on CEPH_FS + select FS_POSIX_ACL + help + POSIX Access Control Lists (ACLs) support permissions for users and + groups beyond the owner/group/world scheme. + + To learn more about Access Control Lists, visit the POSIX ACLs for + Linux website <http://acl.bestbits.at/>. + + If you don't know what Access Control Lists are, say Nfs/ceph/Makefile +1
-0@@ -10,3 +10,4 @@ ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ debugfs.o ceph-$(CONFIG_CEPH_FSCACHE) += cache.o +ceph-$(CONFIG_CEPH_FS_POSIX_ACL) += acl.ofs/ceph/acl.c new file +286
-0@@ -0,0 +1,286 @@ +/* +* linux/fs/ceph/acl.c +* +* Copyright (C) 2013 Guangliang Zhao, <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public +* License v2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public +* License along with this program; if not, write to the +* Free Software Foundation, Inc., 59 Temple Place - Suite 330, +* Boston, MA 021110-1307, USA. +*/ + +#include <linux/ceph/ceph_debug.h> +#include <linux/fs.h> +#include <linux/string.h> +#include <linux/xattr.h> +#include <linux/posix_acl_xattr.h> +#include <linux/posix_acl.h> +#include <linux/sched.h> +#include <linux/slab.h> + +#include "super.h" + +struct posix_acl *ceph_get_acl (struct inode *inode,int type) +{ +int size; +const char *name; +char *value =NULL ; +struct posix_acl *acl; + +if (!IS_POSIXACL (inode)) +return NULL ; + + acl =get_cached_acl (inode, type); +if (acl !=ACL_NOT_CACHED ) +return acl; + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +break ; +case ACL_TYPE_DEFAULT : + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : +BUG (); + } + + size =__ceph_getxattr (inode, name,"" ,0 ); +if (size >0 ) { + value =kzalloc (size,GFP_NOFS ); +if (!value) +return ERR_PTR (-ENOMEM ); + size =__ceph_getxattr (inode, name, value, size); + } + +if (size >0 ) + acl =posix_acl_from_xattr (&init_user_ns, value, size); +else if (size == -ERANGE || size == -ENODATA || size ==0 ) + acl =NULL ; +else + acl =ERR_PTR (-EIO ); + +kfree (value); + +if (!IS_ERR (acl)) +set_cached_acl (inode, type, acl); + +return acl; +} + +static int ceph_set_acl (struct dentry *dentry,struct inode *inode, +struct posix_acl *acl,int type) +{ +int ret =0 , size =0 ; +const char *name =NULL ; +char *value =NULL ; + +if (acl) { + ret =posix_acl_valid (acl); +if (ret <0 ) + goto out; + } + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +if (acl) { + ret =posix_acl_equiv_mode (acl, &inode->i_mode); +if (ret <0 ) + goto out; +if (ret ==0 ) + acl =NULL ; + } +break ; +case ACL_TYPE_DEFAULT : +if (!S_ISDIR (inode->i_mode)) { + ret = acl ? -EINVAL :0 ; + goto out; + } + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : + ret = -EINVAL ; + goto out; + } + +if (acl) { + size =posix_acl_xattr_size (acl->a_count); + value =kmalloc (size,GFP_NOFS ); +if (!value) { + ret = -ENOMEM ; + goto out; + } + + ret =posix_acl_to_xattr (&init_user_ns, acl, value, size); +if (ret <0 ) + goto out_free; + } + +if (value) + ret =__ceph_setxattr (dentry, name, value, size,0 ); +else + ret =__ceph_removexattr (dentry, name); + +if (ret) + goto out_free; + +set_cached_acl (inode, type, acl); + +out_free: +kfree (value); +out: +return ret; +} + +int ceph_init_acl (struct dentry *dentry,struct inode *inode,struct inode *dir) +{ +struct posix_acl *acl =NULL ; +int ret =0 ; + +if (!S_ISLNK (inode->i_mode)) { +if (IS_POSIXACL (dir)) { + acl =ceph_get_acl (dir,ACL_TYPE_DEFAULT ); +if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + } + +if (!acl) + inode->i_mode &= ~current_umask (); + } + +if (IS_POSIXACL (dir) && acl) { +if (S_ISDIR (inode->i_mode)) { + ret =ceph_set_acl (dentry, inode, acl, +ACL_TYPE_DEFAULT ); +if (ret) + goto out_release; + } + ret =posix_acl_create (&acl,GFP_NOFS , &inode->i_mode); +if (ret <0 ) + goto out; +else if (ret >0 ) + ret =ceph_set_acl (dentry, inode, acl,ACL_TYPE_ACCESS ); +else +cache_no_acl (inode); + }else { +cache_no_acl (inode); + } + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +struct posix_acl *acl; +int ret =0 ; + +if (S_ISLNK (inode->i_mode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (!IS_POSIXACL (inode)) + goto out; + + acl =ceph_get_acl (inode,ACL_TYPE_ACCESS ); +if (IS_ERR_OR_NULL (acl)) { + ret =PTR_ERR (acl); + goto out; + } + + ret =posix_acl_chmod (&acl,GFP_KERNEL , inode->i_mode); +if (ret) + goto out; + ret =ceph_set_acl (dentry, inode, acl,ACL_TYPE_ACCESS ); +posix_acl_release (acl); +out: +return ret; +} + +static int ceph_xattr_acl_get (struct dentry *dentry,const char *name, +void *value,size_t size,int type) +{ +struct posix_acl *acl; +int ret =0 ; + +if (!IS_POSIXACL (dentry->d_inode)) +return -EOPNOTSUPP ; + + acl =ceph_get_acl (dentry->d_inode, type); +if (IS_ERR (acl)) +return PTR_ERR (acl); +if (acl ==NULL ) +return -ENODATA ; + + ret =posix_acl_to_xattr (&init_user_ns, acl, value, size); +posix_acl_release (acl); + +return ret; +} + +static int ceph_xattr_acl_set (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags,int type) +{ +int ret =0 ; +struct posix_acl *acl =NULL ; + +if (!inode_owner_or_capable (dentry->d_inode)) { + ret = -EPERM ; + goto out; + } + +if (!IS_POSIXACL (dentry->d_inode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (value) { + acl =posix_acl_from_xattr (&init_user_ns, value, size); +if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + +if (acl) { + ret =posix_acl_valid (acl); +if (ret) + goto out_release; + } + } + + ret =ceph_set_acl (dentry, dentry->d_inode, acl, type); + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +const struct xattr_handler ceph_xattr_acl_default_handler = { + .prefix =POSIX_ACL_XATTR_DEFAULT , + .flags =ACL_TYPE_DEFAULT , + .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +}; + +const struct xattr_handler ceph_xattr_acl_access_handler = { + .prefix =POSIX_ACL_XATTR_ACCESS , + .flags =ACL_TYPE_ACCESS , + .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +};fs/ceph/dir.c +5
-0@@ -693,6 +693,10 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,if (!err && !req->r_reply_info.head->is_dentry) err =ceph_handle_notrace_create (dir, dentry);ceph_mdsc_put_request (req); + +if (!err) + err =ceph_init_acl (dentry, dentry->d_inode, dir); +if (err)d_drop (dentry);return err;@@ -1293,6 +1297,7 @@ const struct inode_operations ceph_dir_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, .mknod = ceph_mknod, .symlink = ceph_symlink, .mkdir = ceph_mkdir,fs/ceph/inode.c +4
-1@@ -95,6 +95,7 @@ const struct inode_operations ceph_file_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };@@ -1632,6 +1633,7 @@ static const struct inode_operations ceph_symlink_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };/* @@ -1702,9 +1704,11 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr) attr->ia_mode);if (issued &CEPH_CAP_AUTH_EXCL ) { inode->i_mode = attr->ia_mode; - dirtied |=CEPH_CAP_AUTH_EXCL ; + dirtied |=CEPH_CAP_AUTH_EXCL |CEPH_CAP_XATTR_EXCL ; + ci->i_xattrs.dirty = true; }else if ((issued &CEPH_CAP_AUTH_SHARED ) ==0 || attr->ia_mode != inode->i_mode) {
Quoted 8 lines
fs/ceph/inode.c int ceph_setattr(struct dentry *dentry, struct iattr *attr) · line 1714
Quoted 4 lines
fs/ceph/inode.c +1
-0+ inode->i_mode = attr->ia_mode; req->r_args.setattr.mode =cpu_to_le32 (attr->ia_mode); mask |=CEPH_SETATTR_MODE ; release |=CEPH_CAP_AUTH_SHARED ;I think these changes are not needed.
ceph_acl_chmod()below will handle the xattr
change.
Good catch :-).
This line(inode->i_mode = attr->ia_mode;) should be left here, the function ceph_acl_chmod() need the new value of inode->i_mode.
Quoted 167 lines
Quoted 167 lines
fs/ceph/inode.c +7
-0@@ -1820,6 +1824,12 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)if (inode_dirty_flags)__mark_inode_dirty (inode, inode_dirty_flags); +if (ia_valid &ATTR_MODE ) { + err =ceph_acl_chmod (dentry, inode); +if (err) + goto out_put; + } +if (mask) { req->r_inode = inode;ihold (inode);@@ -1839,6 +1849,7 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)return err; out:spin_unlock (&ci->i_ceph_lock); +out_put:ceph_mdsc_put_request (req);return err; }fs/ceph/super.c +4
-0@@ -819,7 +819,11 @@ static int ceph_set_super(struct super_block *s, void *data) s->s_flags = fsc->mount_options->sb_flags; s->s_maxbytes =1ULL <<40 ;/* temp value until we get mdsmap */ +#ifdef CONFIG_CEPH_FS_POSIX_ACL + s->s_flags |=MS_POSIXACL ; +#endif + s->s_xattr = ceph_xattr_handlers; s->s_fs_info = fsc; fsc->sb = s;fs/ceph/super.h +31
-0@@ -725,6 +725,9 @@ extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry,/* xattr.c */ extern int ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +int __ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +ssize_t __ceph_getxattr (struct inode *,const char *,void *,size_t ); +int __ceph_removexattr (struct dentry *,const char *);extern ssize_t ceph_getxattr (struct dentry *,const char *,void *,size_t );extern ssize_t ceph_listxattr (struct dentry *,char *,size_t );extern int ceph_removexattr (struct dentry *,const char *);@@ -733,6 +736,34 @@ extern void __ceph_destroy_xattrs(struct ceph_inode_info *ci);extern void __init ceph_xattr_init (void );extern void ceph_xattr_exit (void ); +/* acl.c */ +extern const struct xattr_handler ceph_xattr_acl_access_handler; +extern const struct xattr_handler ceph_xattr_acl_default_handler; +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_init_acl (struct dentry *,struct inode *,struct inode *); +int ceph_acl_chmod (struct dentry *,struct inode *); + +#else + +#define ceph_get_acl NULL + +static inline int ceph_init_acl (struct dentry *dentry,struct inode *inode, +struct inode *dir) +{ +return 0 ; +} + +static inline int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +return 0 ; +} + +#endif +/* caps.c */ extern const char *ceph_cap_string (int c); extern void ceph_handle_caps(struct ceph_mds_session *session,fs/ceph/xattr.c +25
-5@@ -11,11 +11,24 @@#define XATTR_CEPH_PREFIX "ceph."#define XATTR_CEPH_PREFIX_LEN (sizeof (XATTR_CEPH_PREFIX) - 1) +/* +* List of handlers for synthetic system.* attributes. Other +* attributes are handled directly. +*/ +const struct xattr_handler *ceph_xattr_handlers[] = { +#ifdef CONFIG_CEPH_FS_POSIX_ACL + &ceph_xattr_acl_access_handler, + &ceph_xattr_acl_default_handler, +#endif +NULL , +}; +static bool ceph_is_valid_xattr (const char *name) {return !strncmp (name,XATTR_CEPH_PREFIX ,XATTR_CEPH_PREFIX_LEN ) || !strncmp (name,XATTR_SECURITY_PREFIX ,XATTR_SECURITY_PREFIX_LEN ) || + !strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN ) || !strncmp (name,XATTR_TRUSTED_PREFIX ,XATTR_TRUSTED_PREFIX_LEN ) || !strncmp (name,XATTR_USER_PREFIX ,XATTR_USER_PREFIX_LEN ); }@@ -663,10 +676,9 @@ void __ceph_build_xattrs_blob(struct ceph_inode_info *ci) } } -ssize_t ceph_getxattr (struct dentry *dentry,const char *name,void *value, +ssize_t __ceph_getxattr (struct inode *inode,const char *name,void *value,size_t size) { -struct inode *inode = dentry->d_inode;struct ceph_inode_info *ci =ceph_inode (inode);int err;struct ceph_inode_xattr *xattr;@@ -675,7 +687,6 @@ ssize_t ceph_getxattr(struct dentry *dentry, const char *name, void *value,if (!ceph_is_valid_xattr (name))return -ENODATA ; -/* let's see if a virtual xattr was requested */ vxattr =ceph_match_vxattr (inode, name);if (vxattr && !(vxattr->exists_cb && !vxattr->exists_cb (ci))) {@@ -725,6 +736,15 @@ out:return err; } +ssize_t ceph_getxattr (struct dentry *dentry,const char *name,void *value, +size_t size) +{ +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_getxattr (dentry, name, value, size); + +return __ceph_getxattr (dentry->d_inode, name, value, size); +} +ssize_t ceph_listxattr (struct dentry *dentry,char *names,size_t size) {struct inode *inode = dentry->d_inode;@@ -863,8 +883,8 @@ out:return err; } -int ceph_setxattr (struct dentry *dentry,const char *name, -const void *value,size_t size,int flags) +int __ceph_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;@@ -879,9 +899,6 @@ int ceph_setxattr(struct dentry *dentry, const char *name,struct ceph_inode_xattr *xattr =NULL ;int required_blob_size;
Quoted 5 lines
fs/ceph/xattr.c int ceph_setxattr(struct dentry *dentry, const char *name, · line 884
Quoted 3 lines
fs/ceph/xattr.c +0
-3-if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -why remove this ?
Didn't remove, just move it to ceph_setxattr().
The function __ceph_setxattr() would only be called by ceph_setxattr() and ceph_set_acl(), and there are 3 functions which will call it finally:ceph_setxattr(), ceph_setattr()(because of ceph_acl_chmod), and ceph_mknode() (because of ceph_init_acl). All of these functions would check it first when running.
If move the check location, it could return immediately when handling snapshot.
Quoted 36 lines
Quoted 36 lines
fs/ceph/xattr.c +13
-1if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -958,6 +975,18 @@ out:return err; } +int ceph_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) +{ +if (ceph_snap (dentry->d_inode) !=CEPH_NOSNAP ) +return -EROFS ; + +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_setxattr (dentry, name, value, size, flags); + +return __ceph_setxattr (dentry, name, value, size, flags); +} +static int ceph_send_removexattr (struct dentry *dentry,const char *name) {struct ceph_fs_client *fsc =ceph_sb_to_client (dentry->d_sb);@@ -984,7 +1013,7 @@ static int ceph_send_removexattr(struct dentry *dentry, const char *name)return err; } -int ceph_removexattr (struct dentry *dentry,const char *name) +int __ceph_removexattr (struct dentry *dentry,const char *name) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;@@ -994,9 +1023,6 @@ int ceph_removexattr(struct dentry *dentry, const char *name)int required_blob_size;int dirty;
Quoted 5 lines
fs/ceph/xattr.c int ceph_setxattr(struct dentry *dentry, const char *name, · line 884
Quoted 3 lines
fs/ceph/xattr.c +0
-3-if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -??
The same to above.
Quoted 21 lines
Regards
Yan, ZhengQuoted 17 lines
fs/ceph/xattr.c +10
-0if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -1053,3 +1079,13 @@ out:return err; } +int ceph_removexattr (struct dentry *dentry,const char *name) +{ +if (ceph_snap (dentry->d_inode) !=CEPH_NOSNAP ) +return -EROFS ; + +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_removexattr (dentry, name); + +return __ceph_removexattr (dentry, name); +}
Signature · 2 lines
Best regards, Guangliang
Quoted 405 lines · Guangliang Zhao
Quoted 1 line · Zheng
On Thu, Oct 17, 2013 at 4:27 PM, Guangliang Zhao <[email protected]> wrote:
Hi Yan,
Thanks for your reviewing.
Quoted 389 lines
Quoted 389 lines
Add ACL support for cephfs, any comments are appreciated.
Signed-off-by Guangliang Zhao <[email protected]>--- fs/ceph/Kconfig | 13 +++ fs/ceph/Makefile | 1 + fs/ceph/acl.c | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ceph/dir.c | 5 + fs/ceph/inode.c | 13 ++- fs/ceph/super.c | 4 + fs/ceph/super.h | 31 ++++++ fs/ceph/xattr.c | 60 +++++++++--- 8 files changed, 400 insertions(+), 13 deletions(-) create mode 100644 fs/ceph/acl.cfs/ceph/Kconfig +13
-0@@ -25,3 +25,16 @@ config CEPH_FSCACHE caching support for Ceph clients using FS-Cache endif + +config CEPH_FS_POSIX_ACL + bool "Ceph POSIX Access Control Lists" + depends on CEPH_FS + select FS_POSIX_ACL + help + POSIX Access Control Lists (ACLs) support permissions for users and + groups beyond the owner/group/world scheme. + + To learn more about Access Control Lists, visit the POSIX ACLs for + Linux website <http://acl.bestbits.at/>. + + If you don't know what Access Control Lists are, say Nfs/ceph/Makefile +1
-0@@ -10,3 +10,4 @@ ceph-y := super.o inode.o dir.o file.o locks.o addr.o ioctl.o \ debugfs.o ceph-$(CONFIG_CEPH_FSCACHE) += cache.o +ceph-$(CONFIG_CEPH_FS_POSIX_ACL) += acl.ofs/ceph/acl.c new file +286
-0@@ -0,0 +1,286 @@ +/* +* linux/fs/ceph/acl.c +* +* Copyright (C) 2013 Guangliang Zhao, <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public +* License v2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public +* License along with this program; if not, write to the +* Free Software Foundation, Inc., 59 Temple Place - Suite 330, +* Boston, MA 021110-1307, USA. +*/ + +#include <linux/ceph/ceph_debug.h> +#include <linux/fs.h> +#include <linux/string.h> +#include <linux/xattr.h> +#include <linux/posix_acl_xattr.h> +#include <linux/posix_acl.h> +#include <linux/sched.h> +#include <linux/slab.h> + +#include "super.h" + +struct posix_acl *ceph_get_acl (struct inode *inode,int type) +{ +int size; +const char *name; +char *value =NULL ; +struct posix_acl *acl; + +if (!IS_POSIXACL (inode)) +return NULL ; + + acl =get_cached_acl (inode, type); +if (acl !=ACL_NOT_CACHED ) +return acl; + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +break ; +case ACL_TYPE_DEFAULT : + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : +BUG (); + } + + size =__ceph_getxattr (inode, name,"" ,0 ); +if (size >0 ) { + value =kzalloc (size,GFP_NOFS ); +if (!value) +return ERR_PTR (-ENOMEM ); + size =__ceph_getxattr (inode, name, value, size); + } + +if (size >0 ) + acl =posix_acl_from_xattr (&init_user_ns, value, size); +else if (size == -ERANGE || size == -ENODATA || size ==0 ) + acl =NULL ; +else + acl =ERR_PTR (-EIO ); + +kfree (value); + +if (!IS_ERR (acl)) +set_cached_acl (inode, type, acl); + +return acl; +} + +static int ceph_set_acl (struct dentry *dentry,struct inode *inode, +struct posix_acl *acl,int type) +{ +int ret =0 , size =0 ; +const char *name =NULL ; +char *value =NULL ; + +if (acl) { + ret =posix_acl_valid (acl); +if (ret <0 ) + goto out; + } + +switch (type) { +case ACL_TYPE_ACCESS : + name =POSIX_ACL_XATTR_ACCESS ; +if (acl) { + ret =posix_acl_equiv_mode (acl, &inode->i_mode); +if (ret <0 ) + goto out; +if (ret ==0 ) + acl =NULL ; + } +break ; +case ACL_TYPE_DEFAULT : +if (!S_ISDIR (inode->i_mode)) { + ret = acl ? -EINVAL :0 ; + goto out; + } + name =POSIX_ACL_XATTR_DEFAULT ; +break ; +default : + ret = -EINVAL ; + goto out; + } + +if (acl) { + size =posix_acl_xattr_size (acl->a_count); + value =kmalloc (size,GFP_NOFS ); +if (!value) { + ret = -ENOMEM ; + goto out; + } + + ret =posix_acl_to_xattr (&init_user_ns, acl, value, size); +if (ret <0 ) + goto out_free; + } + +if (value) + ret =__ceph_setxattr (dentry, name, value, size,0 ); +else + ret =__ceph_removexattr (dentry, name); + +if (ret) + goto out_free; + +set_cached_acl (inode, type, acl); + +out_free: +kfree (value); +out: +return ret; +} + +int ceph_init_acl (struct dentry *dentry,struct inode *inode,struct inode *dir) +{ +struct posix_acl *acl =NULL ; +int ret =0 ; + +if (!S_ISLNK (inode->i_mode)) { +if (IS_POSIXACL (dir)) { + acl =ceph_get_acl (dir,ACL_TYPE_DEFAULT ); +if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + } + +if (!acl) + inode->i_mode &= ~current_umask (); + } + +if (IS_POSIXACL (dir) && acl) { +if (S_ISDIR (inode->i_mode)) { + ret =ceph_set_acl (dentry, inode, acl, +ACL_TYPE_DEFAULT ); +if (ret) + goto out_release; + } + ret =posix_acl_create (&acl,GFP_NOFS , &inode->i_mode); +if (ret <0 ) + goto out; +else if (ret >0 ) + ret =ceph_set_acl (dentry, inode, acl,ACL_TYPE_ACCESS ); +else +cache_no_acl (inode); + }else { +cache_no_acl (inode); + } + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +struct posix_acl *acl; +int ret =0 ; + +if (S_ISLNK (inode->i_mode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (!IS_POSIXACL (inode)) + goto out; + + acl =ceph_get_acl (inode,ACL_TYPE_ACCESS ); +if (IS_ERR_OR_NULL (acl)) { + ret =PTR_ERR (acl); + goto out; + } + + ret =posix_acl_chmod (&acl,GFP_KERNEL , inode->i_mode); +if (ret) + goto out; + ret =ceph_set_acl (dentry, inode, acl,ACL_TYPE_ACCESS ); +posix_acl_release (acl); +out: +return ret; +} + +static int ceph_xattr_acl_get (struct dentry *dentry,const char *name, +void *value,size_t size,int type) +{ +struct posix_acl *acl; +int ret =0 ; + +if (!IS_POSIXACL (dentry->d_inode)) +return -EOPNOTSUPP ; + + acl =ceph_get_acl (dentry->d_inode, type); +if (IS_ERR (acl)) +return PTR_ERR (acl); +if (acl ==NULL ) +return -ENODATA ; + + ret =posix_acl_to_xattr (&init_user_ns, acl, value, size); +posix_acl_release (acl); + +return ret; +} + +static int ceph_xattr_acl_set (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags,int type) +{ +int ret =0 ; +struct posix_acl *acl =NULL ; + +if (!inode_owner_or_capable (dentry->d_inode)) { + ret = -EPERM ; + goto out; + } + +if (!IS_POSIXACL (dentry->d_inode)) { + ret = -EOPNOTSUPP ; + goto out; + } + +if (value) { + acl =posix_acl_from_xattr (&init_user_ns, value, size); +if (IS_ERR (acl)) { + ret =PTR_ERR (acl); + goto out; + } + +if (acl) { + ret =posix_acl_valid (acl); +if (ret) + goto out_release; + } + } + + ret =ceph_set_acl (dentry, dentry->d_inode, acl, type); + +out_release: +posix_acl_release (acl); +out: +return ret; +} + +const struct xattr_handler ceph_xattr_acl_default_handler = { + .prefix =POSIX_ACL_XATTR_DEFAULT , + .flags =ACL_TYPE_DEFAULT , + .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +}; + +const struct xattr_handler ceph_xattr_acl_access_handler = { + .prefix =POSIX_ACL_XATTR_ACCESS , + .flags =ACL_TYPE_ACCESS , + .get = ceph_xattr_acl_get, + .set = ceph_xattr_acl_set, +};fs/ceph/dir.c +5
-0@@ -693,6 +693,10 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,if (!err && !req->r_reply_info.head->is_dentry) err =ceph_handle_notrace_create (dir, dentry);ceph_mdsc_put_request (req); + +if (!err) + err =ceph_init_acl (dentry, dentry->d_inode, dir); +if (err)d_drop (dentry);return err;@@ -1293,6 +1297,7 @@ const struct inode_operations ceph_dir_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, .mknod = ceph_mknod, .symlink = ceph_symlink, .mkdir = ceph_mkdir,fs/ceph/inode.c +4
-1@@ -95,6 +95,7 @@ const struct inode_operations ceph_file_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };@@ -1632,6 +1633,7 @@ static const struct inode_operations ceph_symlink_iops = { .getxattr = ceph_getxattr, .listxattr = ceph_listxattr, .removexattr = ceph_removexattr, + .get_acl = ceph_get_acl, };/* @@ -1702,9 +1704,11 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr) attr->ia_mode);if (issued &CEPH_CAP_AUTH_EXCL ) { inode->i_mode = attr->ia_mode; - dirtied |=CEPH_CAP_AUTH_EXCL ; + dirtied |=CEPH_CAP_AUTH_EXCL |CEPH_CAP_XATTR_EXCL ; + ci->i_xattrs.dirty = true; }else if ((issued &CEPH_CAP_AUTH_SHARED ) ==0 || attr->ia_mode != inode->i_mode) {Quoted 8 lines
fs/ceph/inode.c int ceph_setattr(struct dentry *dentry, struct iattr *attr) · line 1714
Quoted 4 lines
fs/ceph/inode.c +1
-0+ inode->i_mode = attr->ia_mode; req->r_args.setattr.mode =cpu_to_le32 (attr->ia_mode); mask |=CEPH_SETATTR_MODE ; release |=CEPH_CAP_AUTH_SHARED ;I think these changes are not needed.
ceph_acl_chmod()below will handle the xattr
change.
Quoted 4 lines
Good catch :-).
This
line(inode->i_mode = attr->ia_mode;)should be left here, the functionceph_acl_chmod()need the new value ofinode->i_mode.
yes. please update the patch.
Regards
Yan, Zheng
Quoted 253 lines
Quoted 168 lines
Quoted 168 lines
fs/ceph/inode.c +7
-0@@ -1820,6 +1824,12 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)if (inode_dirty_flags)__mark_inode_dirty (inode, inode_dirty_flags); +if (ia_valid &ATTR_MODE ) { + err =ceph_acl_chmod (dentry, inode); +if (err) + goto out_put; + } +if (mask) { req->r_inode = inode;ihold (inode);@@ -1839,6 +1849,7 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)return err; out:spin_unlock (&ci->i_ceph_lock); +out_put:ceph_mdsc_put_request (req);return err; }fs/ceph/super.c +4
-0@@ -819,7 +819,11 @@ static int ceph_set_super(struct super_block *s, void *data) s->s_flags = fsc->mount_options->sb_flags; s->s_maxbytes =1ULL <<40 ;/* temp value until we get mdsmap */ +#ifdef CONFIG_CEPH_FS_POSIX_ACL + s->s_flags |=MS_POSIXACL ; +#endif + s->s_xattr = ceph_xattr_handlers; s->s_fs_info = fsc; fsc->sb = s;fs/ceph/super.h +31
-0@@ -725,6 +725,9 @@ extern int ceph_getattr(struct vfsmount *mnt, struct dentry *dentry,/* xattr.c */ extern int ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +int __ceph_setxattr (struct dentry *,const char *,const void *,size_t ,int ); +ssize_t __ceph_getxattr (struct inode *,const char *,void *,size_t ); +int __ceph_removexattr (struct dentry *,const char *);extern ssize_t ceph_getxattr (struct dentry *,const char *,void *,size_t );extern ssize_t ceph_listxattr (struct dentry *,char *,size_t );extern int ceph_removexattr (struct dentry *,const char *);@@ -733,6 +736,34 @@ extern void __ceph_destroy_xattrs(struct ceph_inode_info *ci);extern void __init ceph_xattr_init (void );extern void ceph_xattr_exit (void ); +/* acl.c */ +extern const struct xattr_handler ceph_xattr_acl_access_handler; +extern const struct xattr_handler ceph_xattr_acl_default_handler; +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_init_acl (struct dentry *,struct inode *,struct inode *); +int ceph_acl_chmod (struct dentry *,struct inode *); + +#else + +#define ceph_get_acl NULL + +static inline int ceph_init_acl (struct dentry *dentry,struct inode *inode, +struct inode *dir) +{ +return 0 ; +} + +static inline int ceph_acl_chmod (struct dentry *dentry,struct inode *inode) +{ +return 0 ; +} + +#endif +/* caps.c */ extern const char *ceph_cap_string (int c); extern void ceph_handle_caps(struct ceph_mds_session *session,fs/ceph/xattr.c +25
-5@@ -11,11 +11,24 @@#define XATTR_CEPH_PREFIX "ceph."#define XATTR_CEPH_PREFIX_LEN (sizeof (XATTR_CEPH_PREFIX) - 1) +/* +* List of handlers for synthetic system.* attributes. Other +* attributes are handled directly. +*/ +const struct xattr_handler *ceph_xattr_handlers[] = { +#ifdef CONFIG_CEPH_FS_POSIX_ACL + &ceph_xattr_acl_access_handler, + &ceph_xattr_acl_default_handler, +#endif +NULL , +}; +static bool ceph_is_valid_xattr (const char *name) {return !strncmp (name,XATTR_CEPH_PREFIX ,XATTR_CEPH_PREFIX_LEN ) || !strncmp (name,XATTR_SECURITY_PREFIX ,XATTR_SECURITY_PREFIX_LEN ) || + !strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN ) || !strncmp (name,XATTR_TRUSTED_PREFIX ,XATTR_TRUSTED_PREFIX_LEN ) || !strncmp (name,XATTR_USER_PREFIX ,XATTR_USER_PREFIX_LEN ); }@@ -663,10 +676,9 @@ void __ceph_build_xattrs_blob(struct ceph_inode_info *ci) } } -ssize_t ceph_getxattr (struct dentry *dentry,const char *name,void *value, +ssize_t __ceph_getxattr (struct inode *inode,const char *name,void *value,size_t size) { -struct inode *inode = dentry->d_inode;struct ceph_inode_info *ci =ceph_inode (inode);int err;struct ceph_inode_xattr *xattr;@@ -675,7 +687,6 @@ ssize_t ceph_getxattr(struct dentry *dentry, const char *name, void *value,if (!ceph_is_valid_xattr (name))return -ENODATA ; -/* let's see if a virtual xattr was requested */ vxattr =ceph_match_vxattr (inode, name);if (vxattr && !(vxattr->exists_cb && !vxattr->exists_cb (ci))) {@@ -725,6 +736,15 @@ out:return err; } +ssize_t ceph_getxattr (struct dentry *dentry,const char *name,void *value, +size_t size) +{ +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_getxattr (dentry, name, value, size); + +return __ceph_getxattr (dentry->d_inode, name, value, size); +} +ssize_t ceph_listxattr (struct dentry *dentry,char *names,size_t size) {struct inode *inode = dentry->d_inode;@@ -863,8 +883,8 @@ out:return err; } -int ceph_setxattr (struct dentry *dentry,const char *name, -const void *value,size_t size,int flags) +int __ceph_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;@@ -879,9 +899,6 @@ int ceph_setxattr(struct dentry *dentry, const char *name,struct ceph_inode_xattr *xattr =NULL ;int required_blob_size;Quoted 5 lines
fs/ceph/xattr.c int ceph_setxattr(struct dentry *dentry, const char *name, · line 884
Quoted 3 lines
fs/ceph/xattr.c +0
-3-if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -why remove this ?
Didn't remove, just move it to
ceph_setxattr().The function
__ceph_setxattr()would only be called byceph_setxattr()andceph_set_acl(), and there are 3 functions which will call it finally:ceph_setxattr(), ceph_setattr()(because ofceph_acl_chmod), andceph_mknode()(because ofceph_init_acl). All of these functions would check it first when running.If move the check location, it could return immediately when handling snapshot.
Quoted 36 lines
Quoted 36 lines
fs/ceph/xattr.c +13
-1if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -958,6 +975,18 @@ out:return err; } +int ceph_setxattr (struct dentry *dentry,const char *name, +const void *value,size_t size,int flags) +{ +if (ceph_snap (dentry->d_inode) !=CEPH_NOSNAP ) +return -EROFS ; + +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_setxattr (dentry, name, value, size, flags); + +return __ceph_setxattr (dentry, name, value, size, flags); +} +static int ceph_send_removexattr (struct dentry *dentry,const char *name) {struct ceph_fs_client *fsc =ceph_sb_to_client (dentry->d_sb);@@ -984,7 +1013,7 @@ static int ceph_send_removexattr(struct dentry *dentry, const char *name)return err; } -int ceph_removexattr (struct dentry *dentry,const char *name) +int __ceph_removexattr (struct dentry *dentry,const char *name) {struct inode *inode = dentry->d_inode;struct ceph_vxattr *vxattr;@@ -994,9 +1023,6 @@ int ceph_removexattr(struct dentry *dentry, const char *name)int required_blob_size;int dirty;Quoted 5 lines
fs/ceph/xattr.c int ceph_setxattr(struct dentry *dentry, const char *name, · line 884
Quoted 3 lines
fs/ceph/xattr.c +0
-3-if (ceph_snap (inode) !=CEPH_NOSNAP ) -return -EROFS ; -??
The same to above.
Quoted 11 lines
Regards
Yan, ZhengQuoted 7 lines
fs/ceph/xattr.c +0
-0if (!ceph_is_valid_xattr (name))return -EOPNOTSUPP ;@@ -1053,3 +1079,13 @@ out:return err; }Quoted 10 lines
fs/ceph/xattr.c out: · line 1091
Quoted 10 lines
fs/ceph/xattr.c +10
-0+int ceph_removexattr (struct dentry *dentry,const char *name) +{ +if (ceph_snap (dentry->d_inode) !=CEPH_NOSNAP ) +return -EROFS ; + +if (!strncmp (name,XATTR_SYSTEM_PREFIX ,XATTR_SYSTEM_PREFIX_LEN )) +return generic_removexattr (dentry, name); + +return __ceph_removexattr (dentry, name); +}--
Best regards,
Guangliang