aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2005-07-07 20:57:28 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 21:23:52 -0400
commit484e389c63472a7f8cfb491cf11b047364e59365 (patch)
tree764b4430991d19f409e304cf2b96b4346e0af3bb /fs
parentac0811538b40bb92d339d22364026ed91dfdd147 (diff)
[PATCH] set mnt_namespace in the correct place
This patch sets ->mnt_namespace where it's actually added to the namespace. Previously mnt_namespace was set in do_kern_mount() even if the filesystem was never added to any process's namespace (most kernel-internal filesystems). This discrepancy doesn't actually cause any problems, but it's cleaner if mnt_namespace is NULL for these non exported filesystems. Signed-off-by: Miklos Szeredi <miklos@szeredi.hu> Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/namespace.c1
-rw-r--r--fs/super.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index 7fd56eeb21bf..b168dc37eaab 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -808,6 +808,7 @@ int do_add_mount(struct vfsmount *newmnt, struct nameidata *nd,
808 goto unlock; 808 goto unlock;
809 809
810 newmnt->mnt_flags = mnt_flags; 810 newmnt->mnt_flags = mnt_flags;
811 newmnt->mnt_namespace = current->namespace;
811 err = graft_tree(newmnt, nd); 812 err = graft_tree(newmnt, nd);
812 813
813 if (err == 0 && fslist) { 814 if (err == 0 && fslist) {
diff --git a/fs/super.c b/fs/super.c
index 25bc1ec6bc5d..6e57ee252e14 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -840,7 +840,6 @@ do_kern_mount(const char *fstype, int flags, const char *name, void *data)
840 mnt->mnt_root = dget(sb->s_root); 840 mnt->mnt_root = dget(sb->s_root);
841 mnt->mnt_mountpoint = sb->s_root; 841 mnt->mnt_mountpoint = sb->s_root;
842 mnt->mnt_parent = mnt; 842 mnt->mnt_parent = mnt;
843 mnt->mnt_namespace = current->namespace;
844 up_write(&sb->s_umount); 843 up_write(&sb->s_umount);
845 free_secdata(secdata); 844 free_secdata(secdata);
846 put_filesystem(type); 845 put_filesystem(type);