NFS: EXCHANGE_ID should save the server major and minor ID

Save the server major and minor ID results from EXCHANGE_ID, as they
are needed for detecting server trunking.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 16 insertions, 1 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 9e9334a172cf..0d46fe449f0b 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5109,11 +5109,18 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred)
                                 clp->cl_rpcclient->cl_nodename,
                                 clp->cl_rpcclient->cl_auth->au_flavor);
 
+        res.server_owner = kzalloc(sizeof(struct nfs41_server_owner),
+                                        GFP_KERNEL);
+        if (unlikely(res.server_owner == NULL)) {
+                status = -ENOMEM;
+                goto out;
+        }
+
         res.server_scope = kzalloc(sizeof(struct nfs41_server_scope),
                                         GFP_KERNEL);
         if (unlikely(res.server_scope == NULL)) {
                 status = -ENOMEM;
-                goto out;
+                goto out_server_owner;
         }
 
         res.impl_id = kzalloc(sizeof(struct nfs41_impl_id), GFP_KERNEL);
@@ -5127,6 +5134,12 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred)
                 status = nfs4_check_cl_exchange_flags(clp->cl_exchange_flags);
 
         if (status == 0) {
+                kfree(clp->cl_serverowner);
+                clp->cl_serverowner = res.server_owner;
+                res.server_owner = NULL;
+        }
+
+        if (status == 0) {
                 /* use the most recent implementation id */
                 kfree(clp->cl_implid);
                 clp->cl_implid = res.impl_id;
@@ -5150,6 +5163,8 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred)
                 }
         }
 
+out_server_owner:
+        kfree(res.server_owner);
 out_server_scope:
         kfree(res.server_scope);
 out: