Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
5fa6300a
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,发现更多精彩内容 >>
提交
5fa6300a
编写于
1月 31, 2013
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
9p: split dropping the acls from v9fs_set_create_acl()
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
be308f07
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
21 deletion
+28
-21
fs/9p/acl.c
fs/9p/acl.c
+14
-12
fs/9p/acl.h
fs/9p/acl.h
+8
-3
fs/9p/vfs_inode_dotl.c
fs/9p/vfs_inode_dotl.c
+6
-6
未找到文件。
fs/9p/acl.c
浏览文件 @
5fa6300a
...
...
@@ -167,23 +167,25 @@ int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid)
}
int
v9fs_set_create_acl
(
struct
dentry
*
dentry
,
struct
posix_acl
*
*
dpacl
,
struct
posix_acl
**
p
acl
)
struct
posix_acl
*
dacl
,
struct
posix_acl
*
acl
)
{
if
(
dentry
)
{
struct
p9_fid
*
fid
=
v9fs_fid_lookup
(
dentry
);
set_cached_acl
(
dentry
->
d_inode
,
ACL_TYPE_DEFAULT
,
*
dpacl
);
set_cached_acl
(
dentry
->
d_inode
,
ACL_TYPE_ACCESS
,
*
pacl
);
if
(
!
IS_ERR
(
fid
))
{
v9fs_set_acl
(
fid
,
ACL_TYPE_DEFAULT
,
*
dpacl
);
v9fs_set_acl
(
fid
,
ACL_TYPE_ACCESS
,
*
pacl
);
}
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
);
}
posix_acl_release
(
*
dpacl
);
posix_acl_release
(
*
pacl
);
*
dpacl
=
*
pacl
=
NULL
;
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
,
struct
posix_acl
**
dpacl
,
struct
posix_acl
**
pacl
)
{
...
...
fs/9p/acl.h
浏览文件 @
5fa6300a
...
...
@@ -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
int
v9fs_acl_chmod
(
struct
inode
*
,
struct
p9_fid
*
);
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
,
struct
posix_acl
**
dpacl
,
struct
posix_acl
**
pacl
);
extern
void
v9fs_put_acl
(
struct
posix_acl
*
dacl
,
struct
posix_acl
*
acl
);
#else
#define v9fs_iop_get_acl NULL
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
;
}
static
inline
int
v9fs_set_create_acl
(
struct
dentry
*
dentry
,
struct
posix_acl
*
*
dp
acl
,
struct
posix_acl
*
*
p
acl
)
struct
posix_acl
*
d
acl
,
struct
posix_acl
*
acl
)
{
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
,
struct
posix_acl
**
dpacl
,
struct
posix_acl
**
pacl
)
...
...
fs/9p/vfs_inode_dotl.c
浏览文件 @
5fa6300a
...
...
@@ -331,7 +331,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
d_instantiate
(
dentry
,
inode
);
/* 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
);
mutex_lock
(
&
v9inode
->
v_mutex
);
...
...
@@ -364,6 +364,7 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
#endif
*
opened
|=
FILE_CREATED
;
out:
v9fs_put_acl
(
dacl
,
pacl
);
dput
(
res
);
return
err
;
...
...
@@ -373,7 +374,6 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
err_clunk_old_fid:
if
(
ofid
)
p9_client_clunk
(
ofid
);
v9fs_set_create_acl
(
NULL
,
&
dacl
,
&
pacl
);
goto
out
;
}
...
...
@@ -467,13 +467,13 @@ static int v9fs_vfs_mkdir_dotl(struct inode *dir,
d_instantiate
(
dentry
,
inode
);
}
/* 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
);
v9fs_invalidate_inode_attr
(
dir
);
error:
if
(
fid
)
p9_client_clunk
(
fid
);
v9fs_
set_create_acl
(
NULL
,
&
dacl
,
&
pacl
);
v9fs_
put_acl
(
dacl
,
pacl
);
return
err
;
}
...
...
@@ -912,11 +912,11 @@ v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dentry, umode_t omode,
d_instantiate
(
dentry
,
inode
);
}
/* Now set the ACL based on the default value */
v9fs_set_create_acl
(
dentry
,
&
dacl
,
&
pacl
);
v9fs_set_create_acl
(
dentry
,
dacl
,
pacl
);
error:
if
(
fid
)
p9_client_clunk
(
fid
);
v9fs_
set_create_acl
(
NULL
,
&
dacl
,
&
pacl
);
v9fs_
put_acl
(
dacl
,
pacl
);
return
err
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录