Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
14cf1fa8
Commit
14cf1fa8
authored
Nov 25, 2011
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vfs: spread struct mount - remaining argument of mnt_set_mountpoint()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
a8d56d8e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
fs/namespace.c
fs/namespace.c
+4
-4
fs/pnode.c
fs/pnode.c
+1
-1
fs/pnode.h
fs/pnode.h
+1
-1
No files found.
fs/namespace.c
View file @
14cf1fa8
...
@@ -570,10 +570,10 @@ static void detach_mnt(struct mount *mnt, struct path *old_path)
...
@@ -570,10 +570,10 @@ static void detach_mnt(struct mount *mnt, struct path *old_path)
/*
/*
* vfsmount lock must be held for write
* vfsmount lock must be held for write
*/
*/
void
mnt_set_mountpoint
(
struct
vfs
mount
*
mnt
,
struct
dentry
*
dentry
,
void
mnt_set_mountpoint
(
struct
mount
*
mnt
,
struct
dentry
*
dentry
,
struct
mount
*
child_mnt
)
struct
mount
*
child_mnt
)
{
{
child_mnt
->
mnt_parent
=
real_mount
(
mntget
(
mnt
));
child_mnt
->
mnt_parent
=
real_mount
(
mntget
(
&
mnt
->
mnt
));
child_mnt
->
mnt_mountpoint
=
dget
(
dentry
);
child_mnt
->
mnt_mountpoint
=
dget
(
dentry
);
spin_lock
(
&
dentry
->
d_lock
);
spin_lock
(
&
dentry
->
d_lock
);
dentry
->
d_flags
|=
DCACHE_MOUNTED
;
dentry
->
d_flags
|=
DCACHE_MOUNTED
;
...
@@ -585,7 +585,7 @@ void mnt_set_mountpoint(struct vfsmount *mnt, struct dentry *dentry,
...
@@ -585,7 +585,7 @@ void mnt_set_mountpoint(struct vfsmount *mnt, struct dentry *dentry,
*/
*/
static
void
attach_mnt
(
struct
mount
*
mnt
,
struct
path
*
path
)
static
void
attach_mnt
(
struct
mount
*
mnt
,
struct
path
*
path
)
{
{
mnt_set_mountpoint
(
path
->
mnt
,
path
->
dentry
,
mnt
);
mnt_set_mountpoint
(
real_mount
(
path
->
mnt
)
,
path
->
dentry
,
mnt
);
list_add_tail
(
&
mnt
->
mnt_hash
,
mount_hashtable
+
list_add_tail
(
&
mnt
->
mnt_hash
,
mount_hashtable
+
hash
(
path
->
mnt
,
path
->
dentry
));
hash
(
path
->
mnt
,
path
->
dentry
));
list_add_tail
(
&
mnt
->
mnt_child
,
&
real_mount
(
path
->
mnt
)
->
mnt_mounts
);
list_add_tail
(
&
mnt
->
mnt_child
,
&
real_mount
(
path
->
mnt
)
->
mnt_mounts
);
...
@@ -1620,7 +1620,7 @@ static int attach_recursive_mnt(struct mount *source_mnt,
...
@@ -1620,7 +1620,7 @@ static int attach_recursive_mnt(struct mount *source_mnt,
attach_mnt
(
source_mnt
,
path
);
attach_mnt
(
source_mnt
,
path
);
touch_mnt_namespace
(
parent_path
->
mnt
->
mnt_ns
);
touch_mnt_namespace
(
parent_path
->
mnt
->
mnt_ns
);
}
else
{
}
else
{
mnt_set_mountpoint
(
&
dest_mnt
->
mnt
,
dest_dentry
,
source_mnt
);
mnt_set_mountpoint
(
dest_
mnt
,
dest_dentry
,
source_mnt
);
commit_tree
(
source_mnt
);
commit_tree
(
source_mnt
);
}
}
...
...
fs/pnode.c
View file @
14cf1fa8
...
@@ -244,7 +244,7 @@ int propagate_mnt(struct mount *dest_mnt, struct dentry *dest_dentry,
...
@@ -244,7 +244,7 @@ int propagate_mnt(struct mount *dest_mnt, struct dentry *dest_dentry,
}
}
if
(
is_subdir
(
dest_dentry
,
m
->
mnt
.
mnt_root
))
{
if
(
is_subdir
(
dest_dentry
,
m
->
mnt
.
mnt_root
))
{
mnt_set_mountpoint
(
&
m
->
mnt
,
dest_dentry
,
child
);
mnt_set_mountpoint
(
m
,
dest_dentry
,
child
);
list_add_tail
(
&
child
->
mnt_hash
,
tree_list
);
list_add_tail
(
&
child
->
mnt_hash
,
tree_list
);
}
else
{
}
else
{
/*
/*
...
...
fs/pnode.h
View file @
14cf1fa8
...
@@ -37,7 +37,7 @@ int propagate_mount_busy(struct mount *, int);
...
@@ -37,7 +37,7 @@ int propagate_mount_busy(struct mount *, int);
void
mnt_release_group_id
(
struct
mount
*
);
void
mnt_release_group_id
(
struct
mount
*
);
int
get_dominating_id
(
struct
mount
*
mnt
,
const
struct
path
*
root
);
int
get_dominating_id
(
struct
mount
*
mnt
,
const
struct
path
*
root
);
unsigned
int
mnt_get_count
(
struct
mount
*
mnt
);
unsigned
int
mnt_get_count
(
struct
mount
*
mnt
);
void
mnt_set_mountpoint
(
struct
vfs
mount
*
,
struct
dentry
*
,
void
mnt_set_mountpoint
(
struct
mount
*
,
struct
dentry
*
,
struct
mount
*
);
struct
mount
*
);
void
release_mounts
(
struct
list_head
*
);
void
release_mounts
(
struct
list_head
*
);
void
umount_tree
(
struct
mount
*
,
int
,
struct
list_head
*
);
void
umount_tree
(
struct
mount
*
,
int
,
struct
list_head
*
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment