NFS: Create a single nfs_get_root()

This patch splits out the NFS v4 specific functionality of
nfs4_get_root() into its own rpc_op called by the generic client, and
leaves nfs4_proc_get_rootfh() as its own stand alone function.  This
also allows me to change nfs4_remote_mount(), nfs4_xdev_mount() and
nfs4_remote_referral_mount() to use the generic client's nfs_get_root()
function.  Later patches in this series will collapse these functions
into one common function, so using the same get_root() function
everywhere simplifies future changes.

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

1 files changed, 0 insertions, 83 deletions

diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c
index 8a0f33ead77c..8abfb19bd3aa 100644
--- a/fs/nfs/getroot.c
+++ b/fs/nfs/getroot.c
@@ -178,87 +178,4 @@ out:
         return ret;
 }
 
-/*
- * get an NFS4 root dentry from the root filehandle
- */
-struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh,
-                             const char *devname)
-{
-        struct nfs_server *server = NFS_SB(sb);
-        struct nfs_fattr *fattr = NULL;
-        struct dentry *ret;
-        struct inode *inode;
-        void *name = kstrdup(devname, GFP_KERNEL);
-        int error;
-
-        dprintk("--> nfs4_get_root()\n");
-
-        if (!name)
-                return ERR_PTR(-ENOMEM);
-
-        /* get the info about the server and filesystem */
-        error = nfs4_server_capabilities(server, mntfh);
-        if (error < 0) {
-                dprintk("nfs_get_root: getcaps error = %d\n",
-                        -error);
-                kfree(name);
-                return ERR_PTR(error);
-        }
-
-        fattr = nfs_alloc_fattr();
-        if (fattr == NULL) {
-                kfree(name);
-                return ERR_PTR(-ENOMEM);
-        }
-
-        /* get the actual root for this mount */
-        error = server->nfs_client->rpc_ops->getattr(server, mntfh, fattr);
-        if (error < 0) {
-                dprintk("nfs_get_root: getattr error = %d\n", -error);
-                ret = ERR_PTR(error);
-                goto out;
-        }
-
-        if (fattr->valid & NFS_ATTR_FATTR_FSID &&
-            !nfs_fsid_equal(&server->fsid, &fattr->fsid))
-                memcpy(&server->fsid, &fattr->fsid, sizeof(server->fsid));
-
-        inode = nfs_fhget(sb, mntfh, fattr);
-        if (IS_ERR(inode)) {
-                dprintk("nfs_get_root: get root inode failed\n");
-                ret = ERR_CAST(inode);
-                goto out;
-        }
-
-        error = nfs_superblock_set_dummy_root(sb, inode);
-        if (error != 0) {
-                ret = ERR_PTR(error);
-                goto out;
-        }
-
-        /* root dentries normally start off anonymous and get spliced in later
-         * if the dentry tree reaches them; however if the dentry already
-         * exists, we'll pick it up at this point and use it as the root
-         */
-        ret = d_obtain_alias(inode);
-        if (IS_ERR(ret)) {
-                dprintk("nfs_get_root: get root dentry failed\n");
-                goto out;
-        }
-
-        security_d_instantiate(ret, inode);
-        spin_lock(&ret->d_lock);
-        if (IS_ROOT(ret) && !(ret->d_flags & DCACHE_NFSFS_RENAMED)) {
-                ret->d_fsdata = name;
-                name = NULL;
-        }
-        spin_unlock(&ret->d_lock);
-out:
-        if (name)
-                kfree(name);
-        nfs_free_fattr(fattr);
-        dprintk("<-- nfs4_get_root()\n");
-        return ret;
-}
-
 #endif /* CONFIG_NFS_V4 */