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, 8 insertions, 5 deletions

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 12b99825a1c1..5ad2b2c2aecb 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -5144,24 +5144,27 @@ static int decode_exchange_id(struct xdr_stream *xdr,
         if (dummy != SP4_NONE)
                 return -EIO;
 
-        /* Throw away minor_id */
+        /* server_owner4.so_minor_id */
         p = xdr_inline_decode(xdr, 8);
         if (unlikely(!p))
                 goto out_overflow;
+        p = xdr_decode_hyper(p, &res->server_owner->minor_id);
 
-        /* Throw away Major id */
+        /* server_owner4.so_major_id */
         status = decode_opaque_inline(xdr, &dummy, &dummy_str);
         if (unlikely(status))
                 return status;
+        if (unlikely(dummy > NFS4_OPAQUE_LIMIT))
+                return -EIO;
+        memcpy(res->server_owner->major_id, dummy_str, dummy);
+        res->server_owner->major_id_sz = dummy;
 
-        /* Save server_scope */
+        /* server_scope4 */
         status = decode_opaque_inline(xdr, &dummy, &dummy_str);
         if (unlikely(status))
                 return status;
-
         if (unlikely(dummy > NFS4_OPAQUE_LIMIT))
                 return -EIO;
-
         memcpy(res->server_scope->server_scope, dummy_str, dummy);
         res->server_scope->server_scope_sz = dummy;