Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
32301920
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
32301920
编写于
11月 25, 2011
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
vfs: and now we can make ->mnt_master point to struct mount
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
d10e8def
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
12 addition
and
12 deletion
+12
-12
fs/mount.h
fs/mount.h
+1
-1
fs/namespace.c
fs/namespace.c
+2
-2
fs/pnode.c
fs/pnode.c
+9
-9
未找到文件。
fs/mount.h
浏览文件 @
32301920
...
...
@@ -20,7 +20,7 @@ struct mount {
struct
list_head
mnt_mounts
;
/* list of children, anchored here */
struct
list_head
mnt_child
;
/* and going through their mnt_child */
/* yet to be moved - up to mnt_slave */
struct
vfs
mount
*
mnt_master
;
/* slave is on master->mnt_slave_list */
struct
mount
*
mnt_master
;
/* slave is on master->mnt_slave_list */
};
static
inline
struct
mount
*
real_mount
(
struct
vfsmount
*
mnt
)
...
...
fs/namespace.c
浏览文件 @
32301920
...
...
@@ -715,7 +715,7 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root,
if
(
flag
&
CL_SLAVE
)
{
list_add
(
&
mnt
->
mnt
.
mnt_slave
,
&
old
->
mnt
.
mnt_slave_list
);
mnt
->
mnt_master
=
&
old
->
mnt
;
mnt
->
mnt_master
=
old
;
CLEAR_MNT_SHARED
(
&
mnt
->
mnt
);
}
else
if
(
!
(
flag
&
CL_PRIVATE
))
{
if
((
flag
&
CL_MAKE_SHARED
)
||
IS_MNT_SHARED
(
&
old
->
mnt
))
...
...
@@ -1052,7 +1052,7 @@ static int show_mountinfo(struct seq_file *m, void *v)
if
(
IS_MNT_SHARED
(
mnt
))
seq_printf
(
m
,
" shared:%i"
,
mnt
->
mnt_group_id
);
if
(
IS_MNT_SLAVE
(
r
))
{
int
master
=
r
->
mnt_master
->
mnt_group_id
;
int
master
=
r
->
mnt_master
->
mnt
.
mnt
_group_id
;
int
dom
=
get_dominating_id
(
r
,
&
p
->
root
);
seq_printf
(
m
,
" master:%i"
,
master
);
if
(
dom
&&
dom
!=
master
)
...
...
fs/pnode.c
浏览文件 @
32301920
...
...
@@ -55,7 +55,7 @@ int get_dominating_id(struct mount *mnt, const struct path *root)
{
struct
mount
*
m
;
for
(
m
=
real_mount
(
mnt
->
mnt_master
);
m
!=
NULL
;
m
=
real_mount
(
m
->
mnt_master
)
)
{
for
(
m
=
mnt
->
mnt_master
;
m
!=
NULL
;
m
=
m
->
mnt_master
)
{
struct
mount
*
d
=
get_peer_under_root
(
m
,
mnt
->
mnt
.
mnt_ns
,
root
);
if
(
d
)
return
d
->
mnt
.
mnt_group_id
;
...
...
@@ -66,7 +66,7 @@ int get_dominating_id(struct mount *mnt, const struct path *root)
static
int
do_make_slave
(
struct
mount
*
mnt
)
{
struct
mount
*
peer_mnt
=
mnt
,
*
master
=
real_mount
(
mnt
->
mnt_master
)
;
struct
mount
*
peer_mnt
=
mnt
,
*
master
=
mnt
->
mnt_master
;
struct
mount
*
slave_mnt
;
/*
...
...
@@ -93,7 +93,7 @@ static int do_make_slave(struct mount *mnt)
if
(
master
)
{
list_for_each_entry
(
slave_mnt
,
&
mnt
->
mnt
.
mnt_slave_list
,
mnt
.
mnt_slave
)
slave_mnt
->
mnt_master
=
&
master
->
mnt
;
slave_mnt
->
mnt_master
=
master
;
list_move
(
&
mnt
->
mnt
.
mnt_slave
,
&
master
->
mnt
.
mnt_slave_list
);
list_splice
(
&
mnt
->
mnt
.
mnt_slave_list
,
master
->
mnt
.
mnt_slave_list
.
prev
);
INIT_LIST_HEAD
(
&
mnt
->
mnt
.
mnt_slave_list
);
...
...
@@ -106,7 +106,7 @@ static int do_make_slave(struct mount *mnt)
slave_mnt
->
mnt_master
=
NULL
;
}
}
mnt
->
mnt_master
=
&
master
->
mnt
;
mnt
->
mnt_master
=
master
;
CLEAR_MNT_SHARED
(
&
mnt
->
mnt
);
return
0
;
}
...
...
@@ -149,9 +149,9 @@ static struct mount *propagation_next(struct mount *m,
return
first_slave
(
m
);
while
(
1
)
{
struct
mount
*
master
=
real_mount
(
m
->
mnt_master
)
;
struct
mount
*
master
=
m
->
mnt_master
;
if
(
&
master
->
mnt
==
origin
->
mnt_master
)
{
if
(
master
==
origin
->
mnt_master
)
{
struct
mount
*
next
=
next_peer
(
m
);
return
(
next
==
origin
)
?
NULL
:
next
;
}
else
if
(
m
->
mnt
.
mnt_slave
.
next
!=
&
master
->
mnt
.
mnt_slave_list
)
...
...
@@ -179,11 +179,11 @@ static struct mount *get_source(struct mount *dest,
struct
mount
*
p_last_src
=
NULL
;
struct
mount
*
p_last_dest
=
NULL
;
while
(
&
last_dest
->
mn
t
!=
dest
->
mnt_master
)
{
while
(
last_des
t
!=
dest
->
mnt_master
)
{
p_last_dest
=
last_dest
;
p_last_src
=
last_src
;
last_dest
=
real_mount
(
last_dest
->
mnt_master
)
;
last_src
=
real_mount
(
last_src
->
mnt_master
)
;
last_dest
=
last_dest
->
mnt_master
;
last_src
=
last_src
->
mnt_master
;
}
if
(
p_last_dest
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录