mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

vfs: add rcu argument to ->get_acl() callback 

Add a rcu argument to the ->get_acl() callback to allow
get_cached_acl_rcu() to call the ->get_acl() method in the next patch.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Miklos Szeredi 2021-08-18 22:08:24 +02:00
parent 52d5a0c6bd
commit 0cad624662
39 changed files with 91 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/filesystems/locking.rst
View File

@ -70,7 +70,7 @@ prototypes::
const char *(*get_link) (struct dentry *, struct inode *, struct delayed_call *); const char *(*get_link) (struct dentry *, struct inode *, struct delayed_call *);
void (*truncate) (struct inode *); void (*truncate) (struct inode *);
int (*permission) (struct inode *, int, unsigned int); int (*permission) (struct inode *, int, unsigned int);
int (*get_acl)(struct inode *, int); struct posix_acl * (*get_acl)(struct inode *, int, bool);
int (*setattr) (struct dentry *, struct iattr *); int (*setattr) (struct dentry *, struct iattr *);
int (*getattr) (const struct path *, struct kstat *, u32, unsigned int); int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);
ssize_t (*listxattr) (struct dentry *, char *, size_t); ssize_t (*listxattr) (struct dentry *, char *, size_t);

2
Documentation/filesystems/vfs.rst
View File

@ -432,7 +432,7 @@ As of kernel 2.6.22, the following members are defined:
const char *(*get_link) (struct dentry *, struct inode *, const char *(*get_link) (struct dentry *, struct inode *,
struct delayed_call *); struct delayed_call *);
int (*permission) (struct user_namespace *, struct inode *, int); int (*permission) (struct user_namespace *, struct inode *, int);
int (*get_acl)(struct inode *, int); struct posix_acl * (*get_acl)(struct inode *, int, bool);
int (*setattr) (struct user_namespace *, struct dentry *, struct iattr *); int (*setattr) (struct user_namespace *, struct dentry *, struct iattr *);
int (*getattr) (struct user_namespace *, const struct path *, struct kstat *, u32, unsigned int); int (*getattr) (struct user_namespace *, const struct path *, struct kstat *, u32, unsigned int);
ssize_t (*listxattr) (struct dentry *, char *, size_t); ssize_t (*listxattr) (struct dentry *, char *, size_t);

5
fs/9p/acl.c
View File

@ -97,10 +97,13 @@ static struct posix_acl *v9fs_get_cached_acl(struct inode *inode, int type)
return acl; return acl;
} }
struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type) struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type, bool rcu)
{ {
struct v9fs_session_info *v9ses; struct v9fs_session_info *v9ses;
if (rcu)
return ERR_PTR(-ECHILD);
v9ses = v9fs_inode2v9ses(inode); v9ses = v9fs_inode2v9ses(inode);
if (((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT) || if (((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT) ||
((v9ses->flags & V9FS_ACL_MASK) != V9FS_POSIX_ACL)) { ((v9ses->flags & V9FS_ACL_MASK) != V9FS_POSIX_ACL)) {

2
fs/9p/acl.h
View File

@ -16,7 +16,7 @@
#ifdef CONFIG_9P_FS_POSIX_ACL #ifdef CONFIG_9P_FS_POSIX_ACL
extern int v9fs_get_acl(struct inode *, struct p9_fid *); extern int v9fs_get_acl(struct inode *, struct p9_fid *);
extern struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type); extern struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type, bool rcu);
extern int v9fs_acl_chmod(struct inode *, struct p9_fid *); extern int v9fs_acl_chmod(struct inode *, struct p9_fid *);
extern int v9fs_set_create_acl(struct inode *, struct p9_fid *, extern int v9fs_set_create_acl(struct inode *, struct p9_fid *,
struct posix_acl *, struct posix_acl *); struct posix_acl *, struct posix_acl *);

2
fs/bad_inode.c
View File

@ -121,7 +121,7 @@ static const char *bad_inode_get_link(struct dentry *dentry,
return ERR_PTR(-EIO); return ERR_PTR(-EIO);
} }
static struct posix_acl *bad_inode_get_acl(struct inode *inode, int type) static struct posix_acl *bad_inode_get_acl(struct inode *inode, int type, bool rcu)
{ {
return ERR_PTR(-EIO); return ERR_PTR(-EIO);
} }

5
fs/btrfs/acl.c
View File

@ -16,13 +16,16 @@
#include "btrfs_inode.h" #include "btrfs_inode.h"
#include "xattr.h" #include "xattr.h"
struct posix_acl *btrfs_get_acl(struct inode *inode, int type) struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu)
{ {
int size; int size;
const char *name; const char *name;
char *value = NULL; char *value = NULL;
struct posix_acl *acl; struct posix_acl *acl;
if (rcu)
return ERR_PTR(-ECHILD);
switch (type) { switch (type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
name = XATTR_NAME_POSIX_ACL_ACCESS; name = XATTR_NAME_POSIX_ACL_ACCESS;

2
fs/btrfs/ctree.h
View File

@ -3686,7 +3686,7 @@ static inline int __btrfs_fs_compat_ro(struct btrfs_fs_info *fs_info, u64 flag)
/* acl.c */ /* acl.c */
#ifdef CONFIG_BTRFS_FS_POSIX_ACL #ifdef CONFIG_BTRFS_FS_POSIX_ACL
struct posix_acl *btrfs_get_acl(struct inode *inode, int type); struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu);
int btrfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode, int btrfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
struct posix_acl *acl, int type); struct posix_acl *acl, int type);
int btrfs_init_acl(struct btrfs_trans_handle *trans, int btrfs_init_acl(struct btrfs_trans_handle *trans,

5
fs/ceph/acl.c
View File

@ -29,7 +29,7 @@ static inline void ceph_set_cached_acl(struct inode *inode,
spin_unlock(&ci->i_ceph_lock); spin_unlock(&ci->i_ceph_lock);
} }
struct posix_acl *ceph_get_acl(struct inode *inode, int type) struct posix_acl *ceph_get_acl(struct inode *inode, int type, bool rcu)
{ {
int size; int size;
unsigned int retry_cnt = 0; unsigned int retry_cnt = 0;
@ -37,6 +37,9 @@ struct posix_acl *ceph_get_acl(struct inode *inode, int type)
char *value = NULL; char *value = NULL;
struct posix_acl *acl; struct posix_acl *acl;
if (rcu)
return ERR_PTR(-ECHILD);
switch (type) { switch (type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
name = XATTR_NAME_POSIX_ACL_ACCESS; name = XATTR_NAME_POSIX_ACL_ACCESS;

2
fs/ceph/super.h
View File

@ -1087,7 +1087,7 @@ void ceph_release_acl_sec_ctx(struct ceph_acl_sec_ctx *as_ctx);
/* acl.c */ /* acl.c */
#ifdef CONFIG_CEPH_FS_POSIX_ACL #ifdef CONFIG_CEPH_FS_POSIX_ACL
struct posix_acl *ceph_get_acl(struct inode *, int); struct posix_acl *ceph_get_acl(struct inode *, int, bool);
int ceph_set_acl(struct user_namespace *mnt_userns, int ceph_set_acl(struct user_namespace *mnt_userns,
struct inode *inode, struct posix_acl *acl, int type); struct inode *inode, struct posix_acl *acl, int type);
int ceph_pre_init_acls(struct inode *dir, umode_t *mode, int ceph_pre_init_acls(struct inode *dir, umode_t *mode,

5
fs/erofs/xattr.c
View File

@ -673,12 +673,15 @@ ssize_t erofs_listxattr(struct dentry *dentry,
} }
#ifdef CONFIG_EROFS_FS_POSIX_ACL #ifdef CONFIG_EROFS_FS_POSIX_ACL
struct posix_acl *erofs_get_acl(struct inode *inode, int type) struct posix_acl *erofs_get_acl(struct inode *inode, int type, bool rcu)
{ {
struct posix_acl *acl; struct posix_acl *acl;
int prefix, rc; int prefix, rc;
char *value = NULL; char *value = NULL;
if (rcu)
return ERR_PTR(-ECHILD);
switch (type) { switch (type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
prefix = EROFS_XATTR_INDEX_POSIX_ACL_ACCESS; prefix = EROFS_XATTR_INDEX_POSIX_ACL_ACCESS;

2
fs/erofs/xattr.h
View File

@ -80,7 +80,7 @@ static inline int erofs_getxattr(struct inode *inode, int index,
#endif /* !CONFIG_EROFS_FS_XATTR */ #endif /* !CONFIG_EROFS_FS_XATTR */
#ifdef CONFIG_EROFS_FS_POSIX_ACL #ifdef CONFIG_EROFS_FS_POSIX_ACL
struct posix_acl *erofs_get_acl(struct inode *inode, int type); struct posix_acl *erofs_get_acl(struct inode *inode, int type, bool rcu);
#else #else
#define erofs_get_acl (NULL) #define erofs_get_acl (NULL)
#endif #endif

5
fs/ext2/acl.c
View File

@ -141,13 +141,16 @@ fail:
* inode->i_mutex: don't care * inode->i_mutex: don't care
*/ */
struct posix_acl * struct posix_acl *
ext2_get_acl(struct inode *inode, int type) ext2_get_acl(struct inode *inode, int type, bool rcu)
{ {
int name_index; int name_index;
char *value = NULL; char *value = NULL;
struct posix_acl *acl; struct posix_acl *acl;
int retval; int retval;
if (rcu)
return ERR_PTR(-ECHILD);
switch (type) { switch (type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
name_index = EXT2_XATTR_INDEX_POSIX_ACL_ACCESS; name_index = EXT2_XATTR_INDEX_POSIX_ACL_ACCESS;

2
fs/ext2/acl.h
View File

@ -55,7 +55,7 @@ static inline int ext2_acl_count(size_t size)
#ifdef CONFIG_EXT2_FS_POSIX_ACL #ifdef CONFIG_EXT2_FS_POSIX_ACL
/* acl.c */ /* acl.c */
extern struct posix_acl *ext2_get_acl(struct inode *inode, int type); extern struct posix_acl *ext2_get_acl(struct inode *inode, int type, bool rcu);
extern int ext2_set_acl(struct user_namespace *mnt_userns, struct inode *inode, extern int ext2_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
struct posix_acl *acl, int type); struct posix_acl *acl, int type);
extern int ext2_init_acl (struct inode *, struct inode *); extern int ext2_init_acl (struct inode *, struct inode *);

5
fs/ext4/acl.c
View File

@ -142,13 +142,16 @@ fail:
* inode->i_mutex: don't care * inode->i_mutex: don't care
*/ */
struct posix_acl * struct posix_acl *
ext4_get_acl(struct inode *inode, int type) ext4_get_acl(struct inode *inode, int type, bool rcu)
{ {
int name_index; int name_index;
char *value = NULL; char *value = NULL;
struct posix_acl *acl; struct posix_acl *acl;
int retval; int retval;
if (rcu)
return ERR_PTR(-ECHILD);
switch (type) { switch (type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
name_index = EXT4_XATTR_INDEX_POSIX_ACL_ACCESS; name_index = EXT4_XATTR_INDEX_POSIX_ACL_ACCESS;

2
fs/ext4/acl.h
View File

@ -55,7 +55,7 @@ static inline int ext4_acl_count(size_t size)
#ifdef CONFIG_EXT4_FS_POSIX_ACL #ifdef CONFIG_EXT4_FS_POSIX_ACL
/* acl.c */ /* acl.c */
struct posix_acl *ext4_get_acl(struct inode *inode, int type); struct posix_acl *ext4_get_acl(struct inode *inode, int type, bool rcu);
int ext4_set_acl(struct user_namespace *mnt_userns, struct inode *inode, int ext4_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
struct posix_acl *acl, int type); struct posix_acl *acl, int type);
extern int ext4_init_acl(handle_t *, struct inode *, struct inode *); extern int ext4_init_acl(handle_t *, struct inode *, struct inode *);

5
fs/f2fs/acl.c
View File

@ -196,8 +196,11 @@ static struct posix_acl *__f2fs_get_acl(struct inode *inode, int type,
return acl; return acl;
} }
struct posix_acl *f2fs_get_acl(struct inode *inode, int type) struct posix_acl *f2fs_get_acl(struct inode *inode, int type, bool rcu)
{ {
if (rcu)
return ERR_PTR(-ECHILD);
return __f2fs_get_acl(inode, type, NULL); return __f2fs_get_acl(inode, type, NULL);
} }

2
fs/f2fs/acl.h
View File

@ -33,7 +33,7 @@ struct f2fs_acl_header {
#ifdef CONFIG_F2FS_FS_POSIX_ACL #ifdef CONFIG_F2FS_FS_POSIX_ACL
extern struct posix_acl *f2fs_get_acl(struct inode *, int); extern struct posix_acl *f2fs_get_acl(struct inode *, int, bool);
extern int f2fs_set_acl(struct user_namespace *, struct inode *, extern int f2fs_set_acl(struct user_namespace *, struct inode *,
struct posix_acl *, int); struct posix_acl *, int);
extern int f2fs_init_acl(struct inode *, struct inode *, struct page *, extern int f2fs_init_acl(struct inode *, struct inode *, struct page *,

5
fs/fuse/acl.c
View File

@ -11,7 +11,7 @@
#include <linux/posix_acl.h> #include <linux/posix_acl.h>
#include <linux/posix_acl_xattr.h> #include <linux/posix_acl_xattr.h>
struct posix_acl *fuse_get_acl(struct inode *inode, int type) struct posix_acl *fuse_get_acl(struct inode *inode, int type, bool rcu)
{ {
struct fuse_conn *fc = get_fuse_conn(inode); struct fuse_conn *fc = get_fuse_conn(inode);
int size; int size;
@ -19,6 +19,9 @@ struct posix_acl *fuse_get_acl(struct inode *inode, int type)
void *value = NULL; void *value = NULL;
struct posix_acl *acl; struct posix_acl *acl;
if (rcu)
return ERR_PTR(-ECHILD);
if (fuse_is_bad(inode)) if (fuse_is_bad(inode))
return ERR_PTR(-EIO); return ERR_PTR(-EIO);

2
fs/fuse/fuse_i.h
View File

@ -1216,7 +1216,7 @@ extern const struct xattr_handler *fuse_acl_xattr_handlers[];
extern const struct xattr_handler *fuse_no_acl_xattr_handlers[]; extern const struct xattr_handler *fuse_no_acl_xattr_handlers[];
struct posix_acl; struct posix_acl;
struct posix_acl *fuse_get_acl(struct inode *inode, int type); struct posix_acl *fuse_get_acl(struct inode *inode, int type, bool rcu);
int fuse_set_acl(struct user_namespace *mnt_userns, struct inode *inode, int fuse_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
struct posix_acl *acl, int type); struct posix_acl *acl, int type);

5
fs/gfs2/acl.c
View File

@ -57,13 +57,16 @@ static struct posix_acl *__gfs2_get_acl(struct inode *inode, int type)
return acl; return acl;
} }
struct posix_acl *gfs2_get_acl(struct inode *inode, int type) struct posix_acl *gfs2_get_acl(struct inode *inode, int type, bool rcu)
{ {
struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_holder gh; struct gfs2_holder gh;
bool need_unlock = false; bool need_unlock = false;
struct posix_acl *acl; struct posix_acl *acl;
if (rcu)
return ERR_PTR(-ECHILD);
if (!gfs2_glock_is_locked_by_me(ip->i_gl)) { if (!gfs2_glock_is_locked_by_me(ip->i_gl)) {
int ret = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED, int ret = gfs2_glock_nq_init(ip->i_gl, LM_ST_SHARED,
LM_FLAG_ANY, &gh); LM_FLAG_ANY, &gh);

2
fs/gfs2/acl.h
View File

@ -11,7 +11,7 @@
#define GFS2_ACL_MAX_ENTRIES(sdp) ((300 << (sdp)->sd_sb.sb_bsize_shift) >> 12) #define GFS2_ACL_MAX_ENTRIES(sdp) ((300 << (sdp)->sd_sb.sb_bsize_shift) >> 12)
extern struct posix_acl *gfs2_get_acl(struct inode *inode, int type); extern struct posix_acl *gfs2_get_acl(struct inode *inode, int type, bool rcu);
extern int __gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type); extern int __gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type);
extern int gfs2_set_acl(struct user_namespace *mnt_userns, struct inode *inode, extern int gfs2_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
struct posix_acl *acl, int type); struct posix_acl *acl, int type);

5
fs/jffs2/acl.c
View File

@ -173,12 +173,15 @@ static void *jffs2_acl_to_medium(const struct posix_acl *acl, size_t *size)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
struct posix_acl *jffs2_get_acl(struct inode *inode, int type) struct posix_acl *jffs2_get_acl(struct inode *inode, int type, bool rcu)
{ {
struct posix_acl *acl; struct posix_acl *acl;
char *value = NULL; char *value = NULL;
int rc, xprefix; int rc, xprefix;
if (rcu)
return ERR_PTR(-ECHILD);
switch (type) { switch (type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
xprefix = JFFS2_XPREFIX_ACL_ACCESS; xprefix = JFFS2_XPREFIX_ACL_ACCESS;

2
fs/jffs2/acl.h
View File

@ -27,7 +27,7 @@ struct jffs2_acl_header {
#ifdef CONFIG_JFFS2_FS_POSIX_ACL #ifdef CONFIG_JFFS2_FS_POSIX_ACL
struct posix_acl *jffs2_get_acl(struct inode *inode, int type); struct posix_acl *jffs2_get_acl(struct inode *inode, int type, bool rcu);
int jffs2_set_acl(struct user_namespace *mnt_userns, struct inode *inode, int jffs2_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
struct posix_acl *acl, int type); struct posix_acl *acl, int type);
extern int jffs2_init_acl_pre(struct inode *, struct inode *, umode_t *); extern int jffs2_init_acl_pre(struct inode *, struct inode *, umode_t *);

5
fs/jfs/acl.c
View File

@ -14,13 +14,16 @@
#include "jfs_xattr.h" #include "jfs_xattr.h"
#include "jfs_acl.h" #include "jfs_acl.h"
struct posix_acl *jfs_get_acl(struct inode *inode, int type) struct posix_acl *jfs_get_acl(struct inode *inode, int type, bool rcu)
{ {
struct posix_acl *acl; struct posix_acl *acl;
char *ea_name; char *ea_name;
int size; int size;
char *value = NULL; char *value = NULL;
if (rcu)
return ERR_PTR(-ECHILD);
switch(type) { switch(type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
ea_name = XATTR_NAME_POSIX_ACL_ACCESS; ea_name = XATTR_NAME_POSIX_ACL_ACCESS;

2
fs/jfs/jfs_acl.h
View File

@ -7,7 +7,7 @@
#ifdef CONFIG_JFS_POSIX_ACL #ifdef CONFIG_JFS_POSIX_ACL
struct posix_acl *jfs_get_acl(struct inode *inode, int type); struct posix_acl *jfs_get_acl(struct inode *inode, int type, bool rcu);
int jfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode, int jfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
struct posix_acl *acl, int type); struct posix_acl *acl, int type);
int jfs_init_acl(tid_t, struct inode *, struct inode *); int jfs_init_acl(tid_t, struct inode *, struct inode *);

2
fs/nfs/nfs3_fs.h
View File

@ -11,7 +11,7 @@
* nfs3acl.c * nfs3acl.c
*/ */
#ifdef CONFIG_NFS_V3_ACL #ifdef CONFIG_NFS_V3_ACL
extern struct posix_acl *nfs3_get_acl(struct inode *inode, int type); extern struct posix_acl *nfs3_get_acl(struct inode *inode, int type, bool rcu);
extern int nfs3_set_acl(struct user_namespace *mnt_userns, struct inode *inode, extern int nfs3_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
struct posix_acl *acl, int type); struct posix_acl *acl, int type);
extern int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl, extern int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,

5
fs/nfs/nfs3acl.c
View File

@ -44,7 +44,7 @@ static void nfs3_abort_get_acl(struct posix_acl **p)
cmpxchg(p, sentinel, ACL_NOT_CACHED); cmpxchg(p, sentinel, ACL_NOT_CACHED);
} }
struct posix_acl *nfs3_get_acl(struct inode *inode, int type) struct posix_acl *nfs3_get_acl(struct inode *inode, int type, bool rcu)
{ {
struct nfs_server *server = NFS_SERVER(inode); struct nfs_server *server = NFS_SERVER(inode);
struct page *pages[NFSACL_MAXPAGES] = { }; struct page *pages[NFSACL_MAXPAGES] = { };
@ -62,6 +62,9 @@ struct posix_acl *nfs3_get_acl(struct inode *inode, int type)
}; };
int status, count; int status, count;
if (rcu)
return ERR_PTR(-ECHILD);
if (!nfs_server_capable(inode, NFS_CAP_ACLS)) if (!nfs_server_capable(inode, NFS_CAP_ACLS))
return ERR_PTR(-EOPNOTSUPP); return ERR_PTR(-EOPNOTSUPP);

5
fs/ocfs2/acl.c
View File

@ -289,7 +289,7 @@ unlock:
return status; return status;
} }
struct posix_acl *ocfs2_iop_get_acl(struct inode *inode, int type) struct posix_acl *ocfs2_iop_get_acl(struct inode *inode, int type, bool rcu)
{ {
struct ocfs2_super *osb; struct ocfs2_super *osb;
struct buffer_head *di_bh = NULL; struct buffer_head *di_bh = NULL;
@ -297,6 +297,9 @@ struct posix_acl *ocfs2_iop_get_acl(struct inode *inode, int type)
int had_lock; int had_lock;
struct ocfs2_lock_holder oh; struct ocfs2_lock_holder oh;
if (rcu)
return ERR_PTR(-ECHILD);
osb = OCFS2_SB(inode->i_sb); osb = OCFS2_SB(inode->i_sb);
if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL)) if (!(osb->s_mount_opt & OCFS2_MOUNT_POSIX_ACL))
return NULL; return NULL;

2
fs/ocfs2/acl.h
View File

@ -16,7 +16,7 @@ struct ocfs2_acl_entry {
__le32 e_id; __le32 e_id;
}; };
struct posix_acl *ocfs2_iop_get_acl(struct inode *inode, int type); struct posix_acl *ocfs2_iop_get_acl(struct inode *inode, int type, bool rcu);
int ocfs2_iop_set_acl(struct user_namespace *mnt_userns, struct inode *inode, int ocfs2_iop_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
struct posix_acl *acl, int type); struct posix_acl *acl, int type);
extern int ocfs2_acl_chmod(struct inode *, struct buffer_head *); extern int ocfs2_acl_chmod(struct inode *, struct buffer_head *);

5
fs/orangefs/acl.c
View File

@ -10,12 +10,15 @@
#include "orangefs-bufmap.h" #include "orangefs-bufmap.h"
#include <linux/posix_acl_xattr.h> #include <linux/posix_acl_xattr.h>
struct posix_acl *orangefs_get_acl(struct inode *inode, int type) struct posix_acl *orangefs_get_acl(struct inode *inode, int type, bool rcu)
{ {
struct posix_acl *acl; struct posix_acl *acl;
int ret; int ret;
char *key = NULL, *value = NULL; char *key = NULL, *value = NULL;
if (rcu)
return ERR_PTR(-ECHILD);
switch (type) { switch (type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
key = XATTR_NAME_POSIX_ACL_ACCESS; key = XATTR_NAME_POSIX_ACL_ACCESS;

2
fs/orangefs/orangefs-kernel.h
View File

@ -106,7 +106,7 @@ enum orangefs_vfs_op_states {
extern int orangefs_init_acl(struct inode *inode, struct inode *dir); extern int orangefs_init_acl(struct inode *inode, struct inode *dir);
extern const struct xattr_handler *orangefs_xattr_handlers[]; extern const struct xattr_handler *orangefs_xattr_handlers[];
extern struct posix_acl *orangefs_get_acl(struct inode *inode, int type); extern struct posix_acl *orangefs_get_acl(struct inode *inode, int type, bool rcu);
extern int orangefs_set_acl(struct user_namespace *mnt_userns, extern int orangefs_set_acl(struct user_namespace *mnt_userns,
struct inode *inode, struct posix_acl *acl, struct inode *inode, struct posix_acl *acl,
int type); int type);

5
fs/overlayfs/inode.c
View File

@ -446,12 +446,15 @@ ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)
return res; return res;
} }
struct posix_acl *ovl_get_acl(struct inode *inode, int type) struct posix_acl *ovl_get_acl(struct inode *inode, int type, bool rcu)
{ {
struct inode *realinode = ovl_inode_real(inode); struct inode *realinode = ovl_inode_real(inode);
const struct cred *old_cred; const struct cred *old_cred;
struct posix_acl *acl; struct posix_acl *acl;
if (rcu)
return ERR_PTR(-ECHILD);
if (!IS_ENABLED(CONFIG_FS_POSIX_ACL) || !IS_POSIXACL(realinode)) if (!IS_ENABLED(CONFIG_FS_POSIX_ACL) || !IS_POSIXACL(realinode))
return NULL; return NULL;

2
fs/overlayfs/overlayfs.h
View File

@ -498,7 +498,7 @@ int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char *name,
int ovl_xattr_get(struct dentry *dentry, struct inode *inode, const char *name, int ovl_xattr_get(struct dentry *dentry, struct inode *inode, const char *name,
void *value, size_t size); void *value, size_t size);
ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size); ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
struct posix_acl *ovl_get_acl(struct inode *inode, int type); struct posix_acl *ovl_get_acl(struct inode *inode, int type, bool rcu);
int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags); int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags);
bool ovl_is_private_xattr(struct super_block *sb, const char *name); bool ovl_is_private_xattr(struct super_block *sb, const char *name);

2
fs/posix_acl.c
View File

@ -138,7 +138,7 @@ struct posix_acl *get_acl(struct inode *inode, int type)
set_cached_acl(inode, type, NULL); set_cached_acl(inode, type, NULL);
return NULL; return NULL;
} }
acl = inode->i_op->get_acl(inode, type); acl = inode->i_op->get_acl(inode, type, false);
if (IS_ERR(acl)) { if (IS_ERR(acl)) {
/* /*

2
fs/reiserfs/acl.h
View File

@ -48,7 +48,7 @@ static inline int reiserfs_acl_count(size_t size)
} }
#ifdef CONFIG_REISERFS_FS_POSIX_ACL #ifdef CONFIG_REISERFS_FS_POSIX_ACL
struct posix_acl *reiserfs_get_acl(struct inode *inode, int type); struct posix_acl *reiserfs_get_acl(struct inode *inode, int type, bool rcu);
int reiserfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode, int reiserfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
struct posix_acl *acl, int type); struct posix_acl *acl, int type);
int reiserfs_acl_chmod(struct inode *inode); int reiserfs_acl_chmod(struct inode *inode);

5
fs/reiserfs/xattr_acl.c
View File

@ -190,13 +190,16 @@ fail:
* inode->i_mutex: down * inode->i_mutex: down
* BKL held [before 2.5.x] * BKL held [before 2.5.x]
*/ */
struct posix_acl *reiserfs_get_acl(struct inode *inode, int type) struct posix_acl *reiserfs_get_acl(struct inode *inode, int type, bool rcu)
{ {
char *name, *value; char *name, *value;
struct posix_acl *acl; struct posix_acl *acl;
int size; int size;
int retval; int retval;
if (rcu)
return ERR_PTR(-ECHILD);
switch (type) { switch (type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
name = XATTR_NAME_POSIX_ACL_ACCESS; name = XATTR_NAME_POSIX_ACL_ACCESS;

5
fs/xfs/xfs_acl.c
View File

@ -125,7 +125,7 @@ xfs_acl_to_disk(struct xfs_acl *aclp, const struct posix_acl *acl)
} }
struct posix_acl * struct posix_acl *
xfs_get_acl(struct inode *inode, int type) xfs_get_acl(struct inode *inode, int type, bool rcu)
{ {
struct xfs_inode *ip = XFS_I(inode); struct xfs_inode *ip = XFS_I(inode);
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
@ -137,6 +137,9 @@ xfs_get_acl(struct inode *inode, int type)
}; };
int error; int error;
if (rcu)
return ERR_PTR(-ECHILD);
trace_xfs_get_acl(ip); trace_xfs_get_acl(ip);
switch (type) { switch (type) {

4
fs/xfs/xfs_acl.h
View File

@ -10,13 +10,13 @@ struct inode;
struct posix_acl; struct posix_acl;
#ifdef CONFIG_XFS_POSIX_ACL #ifdef CONFIG_XFS_POSIX_ACL
extern struct posix_acl *xfs_get_acl(struct inode *inode, int type); extern struct posix_acl *xfs_get_acl(struct inode *inode, int type, bool rcu);
extern int xfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode, extern int xfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
struct posix_acl *acl, int type); struct posix_acl *acl, int type);
extern int __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type); extern int __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type);
void xfs_forget_acl(struct inode *inode, const char *name); void xfs_forget_acl(struct inode *inode, const char *name);
#else #else
static inline struct posix_acl *xfs_get_acl(struct inode *inode, int type) static inline struct posix_acl *xfs_get_acl(struct inode *inode, int type, bool rcu)
{ {
return NULL; return NULL;
} }

2
include/linux/fs.h
View File

@ -2065,7 +2065,7 @@ struct inode_operations {
struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int); struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
const char * (*get_link) (struct dentry *, struct inode *, struct delayed_call *); const char * (*get_link) (struct dentry *, struct inode *, struct delayed_call *);
int (*permission) (struct user_namespace *, struct inode *, int); int (*permission) (struct user_namespace *, struct inode *, int);
struct posix_acl * (*get_acl)(struct inode *, int); struct posix_acl * (*get_acl)(struct inode *, int, bool);
int (*readlink) (struct dentry *, char __user *,int); int (*readlink) (struct dentry *, char __user *,int);