korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 12:44:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fs: make posix_acl_create more useful

Browse Source 
Rename the current posix_acl_created to __posix_acl_create and add
a fully featured helper to set up the ACLs on file creation that
uses get_acl().

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Christoph Hellwig 2013-12-20 05:16:42 -08:00 committed by Al Viro
parent 5bf3258fd2
commit 37bc15392a
17 changed files with 81 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/9p/acl.c
View File

@ -200,7 +200,7 @@ int v9fs_acl_mode(struct inode *dir, umode_t *modep,
if (acl) { if (acl) {
if (S_ISDIR(mode)) if (S_ISDIR(mode))
*dpacl = posix_acl_dup(acl); *dpacl = posix_acl_dup(acl);
retval = posix_acl_create(&acl, GFP_NOFS, &mode); retval = __posix_acl_create(&acl, GFP_NOFS, &mode);
if (retval < 0) if (retval < 0)
return retval; return retval;
if (retval > 0) if (retval > 0)

2
fs/btrfs/acl.c
View File

@ -222,7 +222,7 @@ int btrfs_init_acl(struct btrfs_trans_handle *trans,
if (ret) if (ret)
goto failed; goto failed;
} }
ret = posix_acl_create(&acl, GFP_NOFS, &inode->i_mode); ret = __posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);
if (ret < 0) if (ret < 0)
return ret; return ret;

2
fs/ext2/acl.c
View File

@ -268,7 +268,7 @@ ext2_init_acl(struct inode *inode, struct inode *dir)
if (error) if (error)
goto cleanup; goto cleanup;
} }
error = posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode); error = __posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode);
if (error < 0) if (error < 0)
return error; return error;
if (error > 0) { if (error > 0) {

2
fs/ext3/acl.c
View File

@ -271,7 +271,7 @@ ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
if (error) if (error)
goto cleanup; goto cleanup;
} }
error = posix_acl_create(&acl, GFP_NOFS, &inode->i_mode); error = __posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);
if (error < 0) if (error < 0)
return error; return error;

2
fs/ext4/acl.c
View File

@ -276,7 +276,7 @@ ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
if (error) if (error)
goto cleanup; goto cleanup;
} }
error = posix_acl_create(&acl, GFP_NOFS, &inode->i_mode); error = __posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);
if (error < 0) if (error < 0)
return error; return error;

2
fs/f2fs/acl.c
View File

@ -285,7 +285,7 @@ int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage)
if (error) if (error)
goto cleanup; goto cleanup;
} }
error = posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode); error = __posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode);
if (error < 0) if (error < 0)
return error; return error;
if (error > 0) if (error > 0)

2
fs/generic_acl.c
View File

@ -128,7 +128,7 @@ generic_acl_init(struct inode *inode, struct inode *dir)
if (acl) { if (acl) {
if (S_ISDIR(inode->i_mode)) if (S_ISDIR(inode->i_mode))
set_cached_acl(inode, ACL_TYPE_DEFAULT, acl); set_cached_acl(inode, ACL_TYPE_DEFAULT, acl);
error = posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode); error = __posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode);
if (error < 0) if (error < 0)
return error; return error;
if (error > 0) if (error > 0)

2
fs/gfs2/acl.c
View File

@ -131,7 +131,7 @@ int gfs2_acl_create(struct gfs2_inode *dip, struct inode *inode)
goto out; goto out;
} }
error = posix_acl_create(&acl, GFP_NOFS, &mode); error = __posix_acl_create(&acl, GFP_NOFS, &mode);
if (error < 0) if (error < 0)
return error; return error;

2
fs/hfsplus/posix_acl.c
View File

@ -137,7 +137,7 @@ int hfsplus_init_posix_acl(struct inode *inode, struct inode *dir)
goto init_acl_cleanup; goto init_acl_cleanup;
} }
err = posix_acl_create(&acl, GFP_NOFS, &inode->i_mode); err = __posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);
if (unlikely(err < 0)) if (unlikely(err < 0))
return err; return err;

2
fs/jffs2/acl.c
View File

@ -295,7 +295,7 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, umode_t *i_mode
if (S_ISDIR(*i_mode)) if (S_ISDIR(*i_mode))
set_cached_acl(inode, ACL_TYPE_DEFAULT, acl); set_cached_acl(inode, ACL_TYPE_DEFAULT, acl);
rc = posix_acl_create(&acl, GFP_KERNEL, i_mode); rc = __posix_acl_create(&acl, GFP_KERNEL, i_mode);
if (rc < 0) if (rc < 0)
return rc; return rc;
if (rc > 0) if (rc > 0)

2
fs/jfs/acl.c
View File

@ -132,7 +132,7 @@ int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir)
if (rc) if (rc)
goto cleanup; goto cleanup;
} }
rc = posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode); rc = __posix_acl_create(&acl, GFP_KERNEL, &inode->i_mode);
if (rc < 0) if (rc < 0)
goto cleanup; /* posix_acl_release(NULL) is no-op */ goto cleanup; /* posix_acl_release(NULL) is no-op */
if (rc > 0) if (rc > 0)

2
fs/nfs/nfs3acl.c
View File

@ -428,7 +428,7 @@ int nfs3_proc_set_default_acl(struct inode *dir, struct inode *inode,
if (!dfacl) if (!dfacl)
return 0; return 0;
acl = posix_acl_dup(dfacl); acl = posix_acl_dup(dfacl);
error = posix_acl_create(&acl, GFP_KERNEL, &mode); error = __posix_acl_create(&acl, GFP_KERNEL, &mode);
if (error < 0) if (error < 0)
goto out_release_dfacl; goto out_release_dfacl;
error = nfs3_proc_setacls(inode, acl, S_ISDIR(inode->i_mode) ? error = nfs3_proc_setacls(inode, acl, S_ISDIR(inode->i_mode) ?

2
fs/ocfs2/acl.c
View File

@ -401,7 +401,7 @@ int ocfs2_init_acl(handle_t *handle,
goto cleanup; goto cleanup;
} }
mode = inode->i_mode; mode = inode->i_mode;
ret = posix_acl_create(&acl, GFP_NOFS, &mode); ret = __posix_acl_create(&acl, GFP_NOFS, &mode);
if (ret < 0) if (ret < 0)
return ret; return ret;

57
fs/posix_acl.c
View File

@ -410,7 +410,7 @@ static int __posix_acl_chmod_masq(struct posix_acl *acl, umode_t mode)
} }
int int
posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p) __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
{ {
struct posix_acl *clone = posix_acl_clone(*acl, gfp); struct posix_acl *clone = posix_acl_clone(*acl, gfp);
int err = -ENOMEM; int err = -ENOMEM;
@ -425,7 +425,7 @@ posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
*acl = clone; *acl = clone;
return err; return err;
} }
EXPORT_SYMBOL(posix_acl_create); EXPORT_SYMBOL(__posix_acl_create);
int int
__posix_acl_chmod(struct posix_acl **acl, gfp_t gfp, umode_t mode) __posix_acl_chmod(struct posix_acl **acl, gfp_t gfp, umode_t mode)
@ -446,7 +446,7 @@ __posix_acl_chmod(struct posix_acl **acl, gfp_t gfp, umode_t mode)
EXPORT_SYMBOL(__posix_acl_chmod); EXPORT_SYMBOL(__posix_acl_chmod);
int int
posix_acl_chmod(struct inode *inode) posix_acl_chmod(struct inode *inode, umode_t mode)
{ {
struct posix_acl *acl; struct posix_acl *acl;
int ret = 0; int ret = 0;
@ -460,7 +460,7 @@ posix_acl_chmod(struct inode *inode)
if (IS_ERR_OR_NULL(acl)) if (IS_ERR_OR_NULL(acl))
return PTR_ERR(acl); return PTR_ERR(acl);
ret = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode); ret = __posix_acl_chmod(&acl, GFP_KERNEL, mode);
if (ret) if (ret)
return ret; return ret;
ret = inode->i_op->set_acl(inode, acl, ACL_TYPE_ACCESS); ret = inode->i_op->set_acl(inode, acl, ACL_TYPE_ACCESS);
@ -469,6 +469,55 @@ posix_acl_chmod(struct inode *inode)
} }
EXPORT_SYMBOL(posix_acl_chmod); EXPORT_SYMBOL(posix_acl_chmod);
int
posix_acl_create(struct inode *dir, umode_t *mode,
struct posix_acl **default_acl, struct posix_acl **acl)
{
struct posix_acl *p;
int ret;
if (S_ISLNK(*mode) || !IS_POSIXACL(dir))
goto no_acl;
p = get_acl(dir, ACL_TYPE_DEFAULT);
if (IS_ERR(p))
return PTR_ERR(p);
if (!p) {
*mode &= ~current_umask();
goto no_acl;
}
*acl = posix_acl_clone(p, GFP_NOFS);
if (!*acl)
return -ENOMEM;
ret = posix_acl_create_masq(*acl, mode);
if (ret < 0) {
posix_acl_release(*acl);
return -ENOMEM;
}
if (ret == 0) {
posix_acl_release(*acl);
*acl = NULL;
}
if (!S_ISDIR(*mode)) {
posix_acl_release(p);
*default_acl = NULL;
} else {
*default_acl = p;
}
return 0;
no_acl:
*default_acl = NULL;
*acl = NULL;
return 0;
}
EXPORT_SYMBOL_GPL(posix_acl_create);
/* /*
* Fix up the uids and gids in posix acl extended attributes in place. * Fix up the uids and gids in posix acl extended attributes in place.
*/ */

2
fs/reiserfs/xattr_acl.c
View File

@ -378,7 +378,7 @@ reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,
/* Now we reconcile the new ACL and the mode, /* Now we reconcile the new ACL and the mode,
potentially modifying both */ potentially modifying both */
err = posix_acl_create(&acl, GFP_NOFS, &inode->i_mode); err = __posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);
if (err < 0) if (err < 0)
return err; return err;

4
fs/xfs/xfs_acl.c
View File

@ -297,12 +297,12 @@ xfs_inherit_acl(struct inode *inode, struct posix_acl *acl)
goto out; goto out;
} }
error = posix_acl_create(&acl, GFP_KERNEL, &mode); error = __posix_acl_create(&acl, GFP_KERNEL, &mode);
if (error < 0) if (error < 0)
return error; return error;
/* /*
* If posix_acl_create returns a positive value we need to * If __posix_acl_create returns a positive value we need to
* inherit a permission that can't be represented using the Unix * inherit a permission that can't be represented using the Unix
* mode bits and we actually need to set an ACL. * mode bits and we actually need to set an ACL.
*/ */

15
include/linux/posix_acl.h
View File

@ -88,14 +88,16 @@ extern int posix_acl_valid(const struct posix_acl *);
extern int posix_acl_permission(struct inode *, const struct posix_acl *, int); extern int posix_acl_permission(struct inode *, const struct posix_acl *, int);
extern struct posix_acl *posix_acl_from_mode(umode_t, gfp_t); extern struct posix_acl *posix_acl_from_mode(umode_t, gfp_t);
extern int posix_acl_equiv_mode(const struct posix_acl *, umode_t *); extern int posix_acl_equiv_mode(const struct posix_acl *, umode_t *);
extern int posix_acl_create(struct posix_acl **, gfp_t, umode_t *); extern int __posix_acl_create(struct posix_acl **, gfp_t, umode_t *);
extern int __posix_acl_chmod(struct posix_acl **, gfp_t, umode_t); extern int __posix_acl_chmod(struct posix_acl **, gfp_t, umode_t);
extern struct posix_acl *get_posix_acl(struct inode *, int); extern struct posix_acl *get_posix_acl(struct inode *, int);
extern int set_posix_acl(struct inode *, int, struct posix_acl *); extern int set_posix_acl(struct inode *, int, struct posix_acl *);
#ifdef CONFIG_FS_POSIX_ACL #ifdef CONFIG_FS_POSIX_ACL
extern int posix_acl_chmod(struct inode *); extern int posix_acl_chmod(struct inode *, umode_t);
extern int posix_acl_create(struct inode *, umode_t *, struct posix_acl **,
struct posix_acl **);
static inline struct posix_acl **acl_by_type(struct inode *inode, int type) static inline struct posix_acl **acl_by_type(struct inode *inode, int type)
{ {
@ -174,7 +176,7 @@ static inline void cache_no_acl(struct inode *inode)
inode->i_default_acl = NULL; inode->i_default_acl = NULL;
} }
#else #else
static inline int posix_acl_chmod(struct inode *inode) static inline int posix_acl_chmod(struct inode *inode, umode_t mode)
{ {
return 0; return 0;
} }
@ -182,6 +184,13 @@ static inline int posix_acl_chmod(struct inode *inode)
static inline void cache_no_acl(struct inode *inode) static inline void cache_no_acl(struct inode *inode)
{ {
} }
static inline int posix_acl_create(struct inode *inode, umode_t *mode,
struct posix_acl **default_acl, struct posix_acl **acl)
{
*default_acl = *acl = NULL;
return 0;
}
#endif /* CONFIG_FS_POSIX_ACL */ #endif /* CONFIG_FS_POSIX_ACL */
struct posix_acl *get_acl(struct inode *inode, int type); struct posix_acl *get_acl(struct inode *inode, int type);