redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

9p: switch v9fs_set_create_acl() to inode+fid, do it before d_instantiate() 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
hifive-unleashed-5.1
Al Viro 2013-01-31 13:45:39 -05:00
parent 5fa6300ae0
commit 3592ac4440
3 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/9p/acl.c
View File

@ -166,16 +166,13 @@ int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid)
return retval; return retval;
} }
int v9fs_set_create_acl(struct dentry *dentry, int v9fs_set_create_acl(struct inode *inode, struct p9_fid *fid,
struct posix_acl *dacl, struct posix_acl *acl) struct posix_acl *dacl, struct posix_acl *acl)
{ {
struct p9_fid *fid = v9fs_fid_lookup(dentry); set_cached_acl(inode, ACL_TYPE_DEFAULT, dacl);
set_cached_acl(dentry->d_inode, ACL_TYPE_DEFAULT, dacl); set_cached_acl(inode, ACL_TYPE_ACCESS, acl);
set_cached_acl(dentry->d_inode, ACL_TYPE_ACCESS, acl); v9fs_set_acl(fid, ACL_TYPE_DEFAULT, dacl);
if (!IS_ERR(fid)) { v9fs_set_acl(fid, ACL_TYPE_ACCESS, acl);
v9fs_set_acl(fid, ACL_TYPE_DEFAULT, dacl);
v9fs_set_acl(fid, ACL_TYPE_ACCESS, acl);
}
return 0; return 0;
} }

5
fs/9p/acl.h
View File

@ -18,7 +18,7 @@
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);
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 inode *, struct p9_fid *,
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);
@ -33,7 +33,8 @@ 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 inode *inode,
struct p9_fid *fid,
struct posix_acl *dacl, struct posix_acl *dacl,
struct posix_acl *acl) struct posix_acl *acl)
{ {

50
fs/9p/vfs_inode_dotl.c
View File

@ -325,14 +325,14 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n", err); p9_debug(P9_DEBUG_VFS, "inode creation failed %d\n", err);
goto error; goto error;
} }
/* Now set the ACL based on the default value */
v9fs_set_create_acl(inode, fid, dacl, pacl);
err = v9fs_fid_add(dentry, fid); err = v9fs_fid_add(dentry, fid);
if (err < 0) if (err < 0)
goto error; goto error;
d_instantiate(dentry, inode); d_instantiate(dentry, inode);
/* Now set the ACL based on the default value */
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);
if (v9ses->cache && !v9inode->writeback_fid && if (v9ses->cache && !v9inode->writeback_fid &&
@ -430,17 +430,17 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
if (err < 0) if (err < 0)
goto error; goto error;
fid = p9_client_walk(dfid, 1, &name, 1);
if (IS_ERR(fid)) {
err = PTR_ERR(fid);
p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n",
err);
fid = NULL;
goto error;
}
/* instantiate inode and assign the unopened fid to the dentry */ /* instantiate inode and assign the unopened fid to the dentry */
if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) { if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
fid = p9_client_walk(dfid, 1, &name, 1);
if (IS_ERR(fid)) {
err = PTR_ERR(fid);
p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n",
err);
fid = NULL;
goto error;
}
inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb); inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb);
if (IS_ERR(inode)) { if (IS_ERR(inode)) {
err = PTR_ERR(inode); err = PTR_ERR(inode);
@ -451,6 +451,7 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
err = v9fs_fid_add(dentry, fid); err = v9fs_fid_add(dentry, fid);
if (err < 0) if (err < 0)
goto error; goto error;
v9fs_set_create_acl(inode, fid, dacl, pacl);
d_instantiate(dentry, inode); d_instantiate(dentry, inode);
fid = NULL; fid = NULL;
} else { } else {
@ -464,10 +465,9 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
err = PTR_ERR(inode); err = PTR_ERR(inode);
goto error; goto error;
} }
v9fs_set_create_acl(inode, fid, dacl, pacl);
d_instantiate(dentry, inode); d_instantiate(dentry, inode);
} }
/* Now set the ACL based on the default value */
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:
@ -876,17 +876,17 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
goto error; goto error;
v9fs_invalidate_inode_attr(dir); v9fs_invalidate_inode_attr(dir);
fid = p9_client_walk(dfid, 1, &name, 1);
if (IS_ERR(fid)) {
err = PTR_ERR(fid);
p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n",
err);
fid = NULL;
goto error;
}
/* instantiate inode and assign the unopened fid to the dentry */ /* instantiate inode and assign the unopened fid to the dentry */
if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) { if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
fid = p9_client_walk(dfid, 1, &name, 1);
if (IS_ERR(fid)) {
err = PTR_ERR(fid);
p9_debug(P9_DEBUG_VFS, "p9_client_walk failed %d\n",
err);
fid = NULL;
goto error;
}
inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb); inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb);
if (IS_ERR(inode)) { if (IS_ERR(inode)) {
err = PTR_ERR(inode); err = PTR_ERR(inode);
@ -894,6 +894,7 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
err); err);
goto error; goto error;
} }
v9fs_set_create_acl(inode, fid, dacl, pacl);
err = v9fs_fid_add(dentry, fid); err = v9fs_fid_add(dentry, fid);
if (err < 0) if (err < 0)
goto error; goto error;
@ -909,10 +910,9 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
err = PTR_ERR(inode); err = PTR_ERR(inode);
goto error; goto error;
} }
v9fs_set_create_acl(inode, fid, dacl, pacl);
d_instantiate(dentry, inode); d_instantiate(dentry, inode);
} }
/* Now set the ACL based on the default value */
v9fs_set_create_acl(dentry, dacl, pacl);
error: error:
if (fid) if (fid)
p9_client_clunk(fid); p9_client_clunk(fid);