nfsd: decode implementation id

Decode the implementation ID and display in nfsd/clients/#/info.  It may
be help identify the client.  It won't be used otherwise.

(When this went into the protocol, I thought the implementation ID would
be a slippery slope towards implementation-specific workarounds as with
the http user-agent.  But I guess I was wrong, the risk seems pretty low
now.)

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 9 insertions, 12 deletions

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 548a5a843b67..442811809f3d 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1389,7 +1389,6 @@ nfsd4_decode_exchange_id(struct nfsd4_compoundargs *argp,
                 goto xdr_error;
         }
 
-        /* Ignore Implementation ID */
         READ_BUF(4);    /* nfs_impl_id4 array length */
         dummy = be32_to_cpup(p++);
 
@@ -1397,21 +1396,19 @@ nfsd4_decode_exchange_id(struct nfsd4_compoundargs *argp,
                 goto xdr_error;
 
         if (dummy == 1) {
-                /* nii_domain */
-                READ_BUF(4);
-                dummy = be32_to_cpup(p++);
-                READ_BUF(dummy);
-                p += XDR_QUADLEN(dummy);
+                status = nfsd4_decode_opaque(argp, &exid->nii_domain);
+                if (status)
+                        goto xdr_error;
 
                 /* nii_name */
-                READ_BUF(4);
-                dummy = be32_to_cpup(p++);
-                READ_BUF(dummy);
-                p += XDR_QUADLEN(dummy);
+                status = nfsd4_decode_opaque(argp, &exid->nii_name);
+                if (status)
+                        goto xdr_error;
 
                 /* nii_date */
-                READ_BUF(12);
-                p += 3;
+                status = nfsd4_decode_time(argp, &exid->nii_time);
+                if (status)
+                        goto xdr_error;
         }
         DECODE_TAIL;
 }