NFS: Create a submount rpc_op

This simplifies the code for v2 and v3 and gives v4 a chance to decide
on referrals without needing to modify the generic client.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 23 insertions, 1 deletions

diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c
index a69ee3952bbe..80fc0fe7095e 100644
--- a/fs/nfs/nfs4namespace.c
+++ b/fs/nfs/nfs4namespace.c
@@ -329,7 +329,7 @@ out:
  * @dentry - dentry of referral
  *
  */
-struct vfsmount *nfs_do_refmount(struct rpc_clnt *client, struct dentry *dentry)
+static struct vfsmount *nfs_do_refmount(struct rpc_clnt *client, struct dentry *dentry)
 {
         struct vfsmount *mnt = ERR_PTR(-ENOMEM);
         struct dentry *parent;
@@ -370,3 +370,25 @@ out:
         dprintk("%s: done\n", __func__);
         return mnt;
 }
+
+struct vfsmount *nfs4_submount(struct nfs_server *server, struct dentry *dentry,
+                               struct nfs_fh *fh, struct nfs_fattr *fattr)
+{
+        struct dentry *parent = dget_parent(dentry);
+        struct rpc_clnt *client;
+        struct vfsmount *mnt;
+
+        /* Look it up again to get its attributes and sec flavor */
+        client = nfs4_proc_lookup_mountpoint(parent->d_inode, &dentry->d_name, fh, fattr);
+        dput(parent);
+        if (IS_ERR(client))
+                return ERR_CAST(client);
+
+        if (fattr->valid & NFS_ATTR_FATTR_V4_REFERRAL)
+                mnt = nfs_do_refmount(client, dentry);
+        else
+                mnt = nfs_do_submount(dentry, fh, fattr, client->cl_auth->au_flavor);
+
+        rpc_shutdown_client(client);
+        return mnt;
+}