Unexport do_add_mount() and add in follow_automount(), not ->d_automount()

[mv-sheeva.git] / fs / cifs / cifs_dfs_ref.c

diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c
index 0fc163808de3ebbe119e6eda968cfd0a344949c6..7ed36536e7540171cd2bcca9f20b79555a5f73d8 100644 (file)
--- a/fs/cifs/cifs_dfs_ref.c
+++ b/fs/cifs/cifs_dfs_ref.c
@@ -351,7 +351,6 @@ free_xid:
 struct vfsmount *cifs_dfs_d_automount(struct path *path)
 {
        struct vfsmount *newmnt;
-       int err;
 
        cFYI(1, "in %s", __func__);
 
@@ -361,25 +360,12 @@ struct vfsmount *cifs_dfs_d_automount(struct path *path)
                return newmnt;
        }
 
-       mntget(newmnt);
-       err = do_add_mount(newmnt, path, path->mnt->mnt_flags | MNT_SHRINKABLE,
-                          &cifs_dfs_automount_list);
-       switch (err) {
-       case 0:
-               schedule_delayed_work(&cifs_dfs_automount_task,
-                                     cifs_dfs_mountpoint_expiry_timeout);
-               cFYI(1, "leaving %s [ok]" , __func__);
-               return newmnt;
-       case -EBUSY:
-               /* someone else made a mount here whilst we were busy */
-               mntput(newmnt);
-               cFYI(1, "leaving %s [EBUSY]" , __func__);
-               return NULL;
-       default:
-               mntput(newmnt);
-               cFYI(1, "leaving %s [error %d]" , __func__, err);
-               return ERR_PTR(err);
-       }
+       mntget(newmnt); /* prevent immediate expiration */
+       mnt_set_expiry(newmnt, &cifs_dfs_automount_list);
+       schedule_delayed_work(&cifs_dfs_automount_task,
+                             cifs_dfs_mountpoint_expiry_timeout);
+       cFYI(1, "leaving %s [ok]" , __func__);
+       return newmnt;
 }
 
 const struct inode_operations cifs_dfs_referral_inode_operations = {