9p: split dropping the acls from v9fs_set_create_acl()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
be308f0796
commit
5fa6300ae0
26
fs/9p/acl.c
26
fs/9p/acl.c
|
@ -167,23 +167,25 @@ int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid)
|
||||||
}
|
}
|
||||||
|
|
||||||
int v9fs_set_create_acl(struct dentry *dentry,
|
int v9fs_set_create_acl(struct dentry *dentry,
|
||||||
struct posix_acl **dpacl, struct posix_acl **pacl)
|
struct posix_acl *dacl, struct posix_acl *acl)
|
||||||
{
|
{
|
||||||
if (dentry) {
|
struct p9_fid *fid = v9fs_fid_lookup(dentry);
|
||||||
struct p9_fid *fid = v9fs_fid_lookup(dentry);
|
set_cached_acl(dentry->d_inode, ACL_TYPE_DEFAULT, dacl);
|
||||||
set_cached_acl(dentry->d_inode, ACL_TYPE_DEFAULT, *dpacl);
|
set_cached_acl(dentry->d_inode, ACL_TYPE_ACCESS, acl);
|
||||||
set_cached_acl(dentry->d_inode, ACL_TYPE_ACCESS, *pacl);
|
if (!IS_ERR(fid)) {
|
||||||
if (!IS_ERR(fid)) {
|
v9fs_set_acl(fid, ACL_TYPE_DEFAULT, dacl);
|
||||||
v9fs_set_acl(fid, ACL_TYPE_DEFAULT, *dpacl);
|
v9fs_set_acl(fid, ACL_TYPE_ACCESS, acl);
|
||||||
v9fs_set_acl(fid, ACL_TYPE_ACCESS, *pacl);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
posix_acl_release(*dpacl);
|
|
||||||
posix_acl_release(*pacl);
|
|
||||||
*dpacl = *pacl = NULL;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void v9fs_put_acl(struct posix_acl *dacl,
|
||||||
|
struct posix_acl *acl)
|
||||||
|
{
|
||||||
|
posix_acl_release(dacl);
|
||||||
|
posix_acl_release(acl);
|
||||||
|
}
|
||||||
|
|
||||||
int v9fs_acl_mode(struct inode *dir, umode_t *modep,
|
int v9fs_acl_mode(struct inode *dir, umode_t *modep,
|
||||||
struct posix_acl **dpacl, struct posix_acl **pacl)
|
struct posix_acl **dpacl, struct posix_acl **pacl)
|
||||||
{
|
{
|
||||||
|
|
11
fs/9p/acl.h
11
fs/9p/acl.h
|
@ -19,9 +19,10 @@ 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);
|
||||||
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 dentry *,
|
extern int v9fs_set_create_acl(struct dentry *,
|
||||||
struct posix_acl **, struct posix_acl **);
|
struct posix_acl *, struct posix_acl *);
|
||||||
extern int v9fs_acl_mode(struct inode *dir, umode_t *modep,
|
extern int v9fs_acl_mode(struct inode *dir, umode_t *modep,
|
||||||
struct posix_acl **dpacl, struct posix_acl **pacl);
|
struct posix_acl **dpacl, struct posix_acl **pacl);
|
||||||
|
extern void v9fs_put_acl(struct posix_acl *dacl, struct posix_acl *acl);
|
||||||
#else
|
#else
|
||||||
#define v9fs_iop_get_acl NULL
|
#define v9fs_iop_get_acl NULL
|
||||||
static inline int v9fs_get_acl(struct inode *inode, struct p9_fid *fid)
|
static inline int v9fs_get_acl(struct inode *inode, struct p9_fid *fid)
|
||||||
|
@ -33,11 +34,15 @@ static inline int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
static inline int v9fs_set_create_acl(struct dentry *dentry,
|
static inline int v9fs_set_create_acl(struct dentry *dentry,
|
||||||
struct posix_acl **dpacl,
|
struct posix_acl *dacl,
|
||||||
struct posix_acl **pacl)
|
struct posix_acl *acl)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
static inline void v9fs_put_acl(struct posix_acl *dacl,
|
||||||
|
struct posix_acl *acl)
|
||||||
|
{
|
||||||
|
}
|
||||||
static inline int v9fs_acl_mode(struct inode *dir, umode_t *modep,
|
static inline int v9fs_acl_mode(struct inode *dir, umode_t *modep,
|
||||||
struct posix_acl **dpacl,
|
struct posix_acl **dpacl,
|
||||||
struct posix_acl **pacl)
|
struct posix_acl **pacl)
|
||||||
|
|
|
@ -331,7 +331,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
|
||||||
d_instantiate(dentry, inode);
|
d_instantiate(dentry, inode);
|
||||||
|
|
||||||
/* Now set the ACL based on the default value */
|
/* Now set the ACL based on the default value */
|
||||||
v9fs_set_create_acl(dentry, &dacl, &pacl);
|
v9fs_set_create_acl(dentry, dacl, pacl);
|
||||||
|
|
||||||
v9inode = V9FS_I(inode);
|
v9inode = V9FS_I(inode);
|
||||||
mutex_lock(&v9inode->v_mutex);
|
mutex_lock(&v9inode->v_mutex);
|
||||||
|
@ -364,6 +364,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
|
||||||
#endif
|
#endif
|
||||||
*opened |= FILE_CREATED;
|
*opened |= FILE_CREATED;
|
||||||
out:
|
out:
|
||||||
|
v9fs_put_acl(dacl, pacl);
|
||||||
dput(res);
|
dput(res);
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
@ -373,7 +374,6 @@ error:
|
||||||
err_clunk_old_fid:
|
err_clunk_old_fid:
|
||||||
if (ofid)
|
if (ofid)
|
||||||
p9_client_clunk(ofid);
|
p9_client_clunk(ofid);
|
||||||
v9fs_set_create_acl(NULL, &dacl, &pacl);
|
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -467,13 +467,13 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
|
||||||
d_instantiate(dentry, inode);
|
d_instantiate(dentry, inode);
|
||||||
}
|
}
|
||||||
/* Now set the ACL based on the default value */
|
/* Now set the ACL based on the default value */
|
||||||
v9fs_set_create_acl(dentry, &dacl, &pacl);
|
v9fs_set_create_acl(dentry, dacl, pacl);
|
||||||
inc_nlink(dir);
|
inc_nlink(dir);
|
||||||
v9fs_invalidate_inode_attr(dir);
|
v9fs_invalidate_inode_attr(dir);
|
||||||
error:
|
error:
|
||||||
if (fid)
|
if (fid)
|
||||||
p9_client_clunk(fid);
|
p9_client_clunk(fid);
|
||||||
v9fs_set_create_acl(NULL, &dacl, &pacl);
|
v9fs_put_acl(dacl, pacl);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -912,11 +912,11 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
|
||||||
d_instantiate(dentry, inode);
|
d_instantiate(dentry, inode);
|
||||||
}
|
}
|
||||||
/* Now set the ACL based on the default value */
|
/* Now set the ACL based on the default value */
|
||||||
v9fs_set_create_acl(dentry, &dacl, &pacl);
|
v9fs_set_create_acl(dentry, dacl, pacl);
|
||||||
error:
|
error:
|
||||||
if (fid)
|
if (fid)
|
||||||
p9_client_clunk(fid);
|
p9_client_clunk(fid);
|
||||||
v9fs_set_create_acl(NULL, &dacl, &pacl);
|
v9fs_put_acl(dacl, pacl);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue