Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
3592ac44
K
Kernel
项目概览
openeuler
/
Kernel
12 个月 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3592ac44
编写于
1月 31, 2013
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
9p: switch v9fs_set_create_acl() to inode+fid, do it before d_instantiate()
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
5fa6300a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
35 deletion
+33
-35
fs/9p/acl.c
fs/9p/acl.c
+5
-8
fs/9p/acl.h
fs/9p/acl.h
+3
-2
fs/9p/vfs_inode_dotl.c
fs/9p/vfs_inode_dotl.c
+25
-25
未找到文件。
fs/9p/acl.c
浏览文件 @
3592ac44
...
...
@@ -166,16 +166,13 @@ int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid)
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
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_ACCESS
,
acl
);
if
(
!
IS_ERR
(
fid
))
{
v9fs_set_acl
(
fid
,
ACL_TYPE_DEFAULT
,
dacl
);
v9fs_set_acl
(
fid
,
ACL_TYPE_ACCESS
,
acl
);
}
set_cached_acl
(
inode
,
ACL_TYPE_DEFAULT
,
dacl
);
set_cached_acl
(
inode
,
ACL_TYPE_ACCESS
,
acl
);
v9fs_set_acl
(
fid
,
ACL_TYPE_DEFAULT
,
dacl
);
v9fs_set_acl
(
fid
,
ACL_TYPE_ACCESS
,
acl
);
return
0
;
}
...
...
fs/9p/acl.h
浏览文件 @
3592ac44
...
...
@@ -18,7 +18,7 @@
extern
int
v9fs_get_acl
(
struct
inode
*
,
struct
p9_fid
*
);
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_set_create_acl
(
struct
dentry
*
,
extern
int
v9fs_set_create_acl
(
struct
inode
*
,
struct
p9_fid
*
,
struct
posix_acl
*
,
struct
posix_acl
*
);
extern
int
v9fs_acl_mode
(
struct
inode
*
dir
,
umode_t
*
modep
,
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
;
}
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
*
acl
)
{
...
...
fs/9p/vfs_inode_dotl.c
浏览文件 @
3592ac44
...
...
@@ -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
);
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
);
if
(
err
<
0
)
goto
error
;
d_instantiate
(
dentry
,
inode
);
/* Now set the ACL based on the default value */
v9fs_set_create_acl
(
dentry
,
dacl
,
pacl
);
v9inode
=
V9FS_I
(
inode
);
mutex_lock
(
&
v9inode
->
v_mutex
);
if
(
v9ses
->
cache
&&
!
v9inode
->
writeback_fid
&&
...
...
@@ -430,17 +430,17 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
if
(
err
<
0
)
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 */
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
);
if
(
IS_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
);
if
(
err
<
0
)
goto
error
;
v9fs_set_create_acl
(
inode
,
fid
,
dacl
,
pacl
);
d_instantiate
(
dentry
,
inode
);
fid
=
NULL
;
}
else
{
...
...
@@ -464,10 +465,9 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
err
=
PTR_ERR
(
inode
);
goto
error
;
}
v9fs_set_create_acl
(
inode
,
fid
,
dacl
,
pacl
);
d_instantiate
(
dentry
,
inode
);
}
/* Now set the ACL based on the default value */
v9fs_set_create_acl
(
dentry
,
dacl
,
pacl
);
inc_nlink
(
dir
);
v9fs_invalidate_inode_attr
(
dir
);
error:
...
...
@@ -876,17 +876,17 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
goto
error
;
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 */
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
);
if
(
IS_ERR
(
inode
))
{
err
=
PTR_ERR
(
inode
);
...
...
@@ -894,6 +894,7 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
err
);
goto
error
;
}
v9fs_set_create_acl
(
inode
,
fid
,
dacl
,
pacl
);
err
=
v9fs_fid_add
(
dentry
,
fid
);
if
(
err
<
0
)
goto
error
;
...
...
@@ -909,10 +910,9 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
err
=
PTR_ERR
(
inode
);
goto
error
;
}
v9fs_set_create_acl
(
inode
,
fid
,
dacl
,
pacl
);
d_instantiate
(
dentry
,
inode
);
}
/* Now set the ACL based on the default value */
v9fs_set_create_acl
(
dentry
,
dacl
,
pacl
);
error:
if
(
fid
)
p9_client_clunk
(
fid
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录