NFS: Move rpc_ops from nfs_server to nfs_client

Move the rpc_ops from the nfs_server struct to the nfs_client struct as they're
common to all server records of a particular NFS protocol version.

Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index 85d9ed1dcf42..d8b8d56266cb 100644
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -104,7 +104,9 @@ static void * nfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd)
                 goto out_follow;
         /* Look it up again */
         parent = dget_parent(nd->dentry);
-        err = server->rpc_ops->lookup(parent->d_inode, &nd->dentry->d_name, &fh, &fattr);
+        err = server->nfs_client->rpc_ops->lookup(parent->d_inode,
+                                                  &nd->dentry->d_name,
+                                                  &fh, &fattr);
         dput(parent);
         if (err != 0)
                 goto out_err;
@@ -178,7 +180,7 @@ static struct vfsmount *nfs_do_clone_mount(struct nfs_server *server,
 {
 #ifdef CONFIG_NFS_V4
         struct vfsmount *mnt = NULL;
-        switch (server->rpc_ops->version) {
+        switch (server->nfs_client->cl_nfsversion) {
                 case 2:
                 case 3:
                         mnt = vfs_kern_mount(&clone_nfs_fs_type, 0, devname, mountdata);