diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-24 19:31:36 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:52:37 -0500 |
commit | aa0a4cf0ab4b03db21133a0ba62f558ed1bfcd1d (patch) | |
tree | 141a3bbb532709dcb494e2bce956c778757ed870 /fs/namespace.c | |
parent | 6c449c8dfe30142b3ced5f052e8ed3cce308801a (diff) |
vfs: dentry_reset_mounted() doesn't use vfsmount argument
lose it
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namespace.c')
-rw-r--r-- | fs/namespace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 0953a3a6d45e..ed21ac4f7c69 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -523,7 +523,7 @@ static void __touch_mnt_namespace(struct mnt_namespace *ns) | |||
523 | * Clear dentry's mounted state if it has no remaining mounts. | 523 | * Clear dentry's mounted state if it has no remaining mounts. |
524 | * vfsmount_lock must be held for write. | 524 | * vfsmount_lock must be held for write. |
525 | */ | 525 | */ |
526 | static void dentry_reset_mounted(struct vfsmount *mnt, struct dentry *dentry) | 526 | static void dentry_reset_mounted(struct dentry *dentry) |
527 | { | 527 | { |
528 | unsigned u; | 528 | unsigned u; |
529 | 529 | ||
@@ -551,7 +551,7 @@ static void detach_mnt(struct vfsmount *mnt, struct path *old_path) | |||
551 | mnt->mnt_mountpoint = mnt->mnt_root; | 551 | mnt->mnt_mountpoint = mnt->mnt_root; |
552 | list_del_init(&mnt->mnt_child); | 552 | list_del_init(&mnt->mnt_child); |
553 | list_del_init(&mnt->mnt_hash); | 553 | list_del_init(&mnt->mnt_hash); |
554 | dentry_reset_mounted(old_path->mnt, old_path->dentry); | 554 | dentry_reset_mounted(old_path->dentry); |
555 | } | 555 | } |
556 | 556 | ||
557 | /* | 557 | /* |
@@ -1224,7 +1224,7 @@ void umount_tree(struct vfsmount *mnt, int propagate, struct list_head *kill) | |||
1224 | list_del_init(&p->mnt_child); | 1224 | list_del_init(&p->mnt_child); |
1225 | if (mnt_has_parent(p)) { | 1225 | if (mnt_has_parent(p)) { |
1226 | p->mnt_parent->mnt_ghosts++; | 1226 | p->mnt_parent->mnt_ghosts++; |
1227 | dentry_reset_mounted(p->mnt_parent, p->mnt_mountpoint); | 1227 | dentry_reset_mounted(p->mnt_mountpoint); |
1228 | } | 1228 | } |
1229 | change_mnt_propagation(p, MS_PRIVATE); | 1229 | change_mnt_propagation(p, MS_PRIVATE); |
1230 | } | 1230 | } |