This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / namespace.c

diff --git a/fs/namespace.c b/fs/namespace.c
index 96a4d73..b5e7224 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -223,26 +223,23 @@ static int show_vfsmnt(struct seq_file *m, void *v)
        struct vfsmount *mnt = v;
        int err = 0;
        static struct proc_fs_info {
-               int s_flag;
-               int mnt_flag;
-               char *set_str;
-               char *unset_str;
+               int flag;
+               char *str;
        } fs_info[] = {
-               { MS_RDONLY, MNT_RDONLY, "ro", "rw" },
-               { MS_SYNCHRONOUS, 0, ",sync", NULL },
-               { MS_DIRSYNC, 0, ",dirsync", NULL },
-               { MS_MANDLOCK, 0, ",mand", NULL },
-               { MS_NOATIME, MNT_NOATIME, ",noatime", NULL },
-               { MS_NODIRATIME, MNT_NODIRATIME, ",nodiratime", NULL },
-               { MS_TAGXID, MS_TAGXID, ",tagxid", NULL },
-               { 0, MNT_NOSUID, ",nosuid", NULL },
-               { 0, MNT_NODEV, ",nodev", NULL },
-               { 0, MNT_NOEXEC, ",noexec", NULL },
-               { 0, 0, NULL, NULL }
+               { MS_SYNCHRONOUS, ",sync" },
+               { MS_DIRSYNC, ",dirsync" },
+               { MS_MANDLOCK, ",mand" },
+               { MS_NOATIME, ",noatime" },
+               { MS_NODIRATIME, ",nodiratime" },
+               { 0, NULL }
        };
-       struct proc_fs_info *p;
-       unsigned long s_flags = mnt->mnt_sb->s_flags;
-       int mnt_flags = mnt->mnt_flags;
+       static struct proc_fs_info mnt_info[] = {
+               { MNT_NOSUID, ",nosuid" },
+               { MNT_NODEV, ",nodev" },
+               { MNT_NOEXEC, ",noexec" },
+               { 0, NULL }
+       };
+       struct proc_fs_info *fs_infop;
 
        if (vx_flags(VXF_HIDE_MOUNT, 0))
                return 0;
@@ -252,15 +249,14 @@ static int show_vfsmnt(struct seq_file *m, void *v)
        seq_path(m, mnt, mnt->mnt_root, " \t\n\\");
        seq_putc(m, ' ');
        mangle(m, mnt->mnt_sb->s_type->name);
-       seq_putc(m, ' ');
-       for (p = fs_info; (p->s_flag | p->mnt_flag) ; p++) {
-               if ((s_flags & p->s_flag) || (mnt_flags & p->mnt_flag)) {
-                       if (p->set_str)
-                               seq_puts(m, p->set_str);
-               } else {
-                       if (p->unset_str)
-                               seq_puts(m, p->unset_str);
-               }
+       seq_puts(m, mnt->mnt_sb->s_flags & MS_RDONLY ? " ro" : " rw");
+       for (fs_infop = fs_info; fs_infop->flag; fs_infop++) {
+               if (mnt->mnt_sb->s_flags & fs_infop->flag)
+                       seq_puts(m, fs_infop->str);
+       }
+       for (fs_infop = mnt_info; fs_infop->flag; fs_infop++) {
+               if (mnt->mnt_flags & fs_infop->flag)
+                       seq_puts(m, fs_infop->str);
        }
        if (mnt->mnt_sb->s_op->show_options)
                err = mnt->mnt_sb->s_op->show_options(m, mnt);
@@ -647,13 +643,11 @@ out_unlock:
 /*
  * do loopback mount.
  */
-static int do_loopback(struct nameidata *nd, char *old_name, unsigned long flags, int mnt_flags)
+static int do_loopback(struct nameidata *nd, char *old_name, int recurse)
 {
        struct nameidata old_nd;
        struct vfsmount *mnt = NULL;
-       int recurse = flags & MS_REC;
        int err = mount_is_safe(nd);
-
        if (err)
                return err;
        if (!old_name || !*old_name)
@@ -685,7 +679,6 @@ static int do_loopback(struct nameidata *nd, char *old_name, unsigned long flags
                        spin_unlock(&vfsmount_lock);
                } else
                        mntput(mnt);
-               mnt->mnt_flags = mnt_flags;
        }
 
        up_write(&current->namespace->sem);
@@ -1031,18 +1024,12 @@ long do_mount(char * dev_name, char * dir_name, char *type_page,
                ((char *)data_page)[PAGE_SIZE - 1] = 0;
 
        /* Separate the per-mountpoint flags */
-       if (flags & MS_RDONLY)
-               mnt_flags |= MNT_RDONLY;
        if (flags & MS_NOSUID)
                mnt_flags |= MNT_NOSUID;
        if (flags & MS_NODEV)
                mnt_flags |= MNT_NODEV;
        if (flags & MS_NOEXEC)
                mnt_flags |= MNT_NOEXEC;
-       if (flags & MS_NOATIME)
-               mnt_flags |= MNT_NOATIME;
-       if (flags & MS_NODIRATIME)
-               mnt_flags |= MNT_NODIRATIME;
        flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_ACTIVE);
 
        if (vx_ccaps(VXC_SECURE_MOUNT))
@@ -1061,7 +1048,7 @@ long do_mount(char * dev_name, char * dir_name, char *type_page,
                retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
                                    data_page);
        else if (flags & MS_BIND)
-               retval = do_loopback(&nd, dev_name, flags, mnt_flags);
+               retval = do_loopback(&nd, dev_name, flags & MS_REC);
        else if (flags & MS_MOVE)
                retval = do_move_mount(&nd, dev_name);
        else
@@ -1078,7 +1065,6 @@ int copy_namespace(int flags, struct task_struct *tsk)
        struct namespace *new_ns;
        struct vfsmount *rootmnt = NULL, *pwdmnt = NULL, *altrootmnt = NULL;
        struct fs_struct *fs = tsk->fs;
-       struct vfsmount *p, *q;
 
        if (!namespace)
                return 0;
@@ -1113,16 +1099,14 @@ int copy_namespace(int flags, struct task_struct *tsk)
        list_add_tail(&new_ns->list, &new_ns->root->mnt_list);
        spin_unlock(&vfsmount_lock);
 
-       /*
-        * Second pass: switch the tsk->fs->* elements and mark new vfsmounts
-        * as belonging to new namespace.  We have already acquired a private
-        * fs_struct, so tsk->fs->lock is not needed.
-        */
-       p = namespace->root;
-       q = new_ns->root;
-       while (p) {
-               q->mnt_namespace = new_ns;
-               if (fs) {
+       /* Second pass: switch the tsk->fs->* elements */
+       if (fs) {
+               struct vfsmount *p, *q;
+               write_lock(&fs->lock);
+
+               p = namespace->root;
+               q = new_ns->root;
+               while (p) {
                        if (p == fs->rootmnt) {
                                rootmnt = p;
                                fs->rootmnt = mntget(q);
@@ -1135,9 +1119,10 @@ int copy_namespace(int flags, struct task_struct *tsk)
                                altrootmnt = p;
                                fs->altrootmnt = mntget(q);
                        }
+                       p = next_mnt(p, namespace->root);
+                       q = next_mnt(q, new_ns->root);
                }
-               p = next_mnt(p, namespace->root);
-               q = next_mnt(q, new_ns->root);
+               write_unlock(&fs->lock);
        }
        up_write(&tsk->namespace->sem);