Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / fs / namei.c

diff --git a/fs/namei.c b/fs/namei.c
index 8f7b41a14882eec85c4ab8e46a9e86f41a0c6c79..7d77f24d32a98a115e320605369006eeef30ae0d 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -923,37 +923,13 @@ static int follow_automount(struct path *path, unsigned flags,
        if (!mnt) /* mount collision */
                return 0;
 
-       /* The new mount record should have at least 2 refs to prevent it being
-        * expired before we get a chance to add it
-        */
-       BUG_ON(mnt_get_count(mnt) < 2);
-
-       if (mnt->mnt_sb == path->mnt->mnt_sb &&
-           mnt->mnt_root == path->dentry) {
-               mnt_clear_expiry(mnt);
-               mntput(mnt);
-               mntput(mnt);
-               return -ELOOP;
-       }
+       err = finish_automount(mnt, path);
 
-       /* We need to add the mountpoint to the parent.  The filesystem may
-        * have placed it on an expiry list, and so we need to make sure it
-        * won't be expired under us if do_add_mount() fails (do_add_mount()
-        * will eat a reference unconditionally).
-        */
-       mntget(mnt);
-       err = do_add_mount(mnt, path, path->mnt->mnt_flags | MNT_SHRINKABLE);
        switch (err) {
        case -EBUSY:
                /* Someone else made a mount here whilst we were busy */
-               err = 0;
-       default:
-               mnt_clear_expiry(mnt);
-               mntput(mnt);
-               mntput(mnt);
-               return err;
+               return 0;
        case 0:
-               mntput(mnt);
                dput(path->dentry);
                if (*need_mntput)
                        mntput(path->mnt);
@@ -961,7 +937,10 @@ static int follow_automount(struct path *path, unsigned flags,
                path->dentry = dget(mnt->mnt_root);
                *need_mntput = true;
                return 0;
+       default:
+               return err;
        }
+
 }
 
 /*
@@ -1293,8 +1272,10 @@ done:
        path->mnt = mnt;
        path->dentry = dentry;
        err = follow_managed(path, nd->flags);
-       if (unlikely(err < 0))
+       if (unlikely(err < 0)) {
+               path_put_conditional(path, nd);
                return err;
+       }
        *inode = path->dentry->d_inode;
        return 0;