[PATCH] sanitize the interface of graft_tree().

[net-next-2.6.git] / fs / namespace.c

diff --git a/fs/namespace.c b/fs/namespace.c
index 685687dccbf17086f9771a0197904c787b9a66ca..dfeeab964e84cc656ddc696eed846de25b27dd58 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -650,7 +650,6 @@ static int graft_tree(struct vfsmount *mnt, struct nameidata *nd)
                attach_mnt(mnt, nd);
                list_add_tail(&head, &mnt->mnt_list);
                list_splice(&head, current->namespace->list.prev);
-               mntget(mnt);
                err = 0;
                touch_namespace(current->namespace);
        }
@@ -702,8 +701,7 @@ static int do_loopback(struct nameidata *nd, char *old_name, int recurse)
                spin_lock(&vfsmount_lock);
                umount_tree(mnt);
                spin_unlock(&vfsmount_lock);
-       } else
-               mntput(mnt);
+       }
 
 out:
        up_write(&current->namespace->sem);
@@ -857,15 +855,17 @@ int do_add_mount(struct vfsmount *newmnt, struct nameidata *nd,
                goto unlock;
 
        newmnt->mnt_flags = mnt_flags;
-       newmnt->mnt_namespace = current->namespace;
-       err = graft_tree(newmnt, nd);
+       if ((err = graft_tree(newmnt, nd)))
+               goto unlock;
 
-       if (err == 0 && fslist) {
+       if (fslist) {
                /* add to the specified expiration list */
                spin_lock(&vfsmount_lock);
                list_add_tail(&newmnt->mnt_expire, fslist);
                spin_unlock(&vfsmount_lock);
        }
+       up_write(&current->namespace->sem);
+       return 0;
 
 unlock:
        up_write(&current->namespace->sem);