Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Olga Kornievskaia <olga.kornievskaia@gmail.com>
To:     trond.myklebust@hammerspace.com, anna.schumaker@netapp.com
Cc:     linux-nfs@vger.kernel.org
Subject: [PATCH 1/1] NFSv4.0 encode nconnect-enabled client into clientid
Date:   Fri, 31 Jan 2020 11:57:02 -0500
Message-Id: <20200131165702.1751-1-olga.kornievskaia@gmail.com>
Sender: linux-nfs-owner@vger.kernel.org
Precedence: bulk

From: Olga Kornievskaia <kolga@netapp.com>

It helps some servers to be able to identify if the incoming client is
doing nconnect mount or not. While creating the unique client id for
the SETCLIENTID operation add nconnect=X to it.

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
---
 fs/nfs/nfs4proc.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 402410c..a90ea28 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5950,7 +5950,7 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp,
 		return 0;
 
 	rcu_read_lock();
-	len = 14 +
+	len = 14 + 12 +
 		strlen(clp->cl_rpcclient->cl_nodename) +
 		1 +
 		strlen(rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR)) +
@@ -5972,13 +5972,15 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp,
 
 	rcu_read_lock();
 	if (nfs4_client_id_uniquifier[0] != '\0')
-		scnprintf(str, len, "Linux NFSv4.0 %s/%s/%s",
+		scnprintf(str, len, "Linux NFSv4.0 nconnect=%d %s/%s/%s",
+			  clp->cl_nconnect,
 			  clp->cl_rpcclient->cl_nodename,
 			  nfs4_client_id_uniquifier,
 			  rpc_peeraddr2str(clp->cl_rpcclient,
 					   RPC_DISPLAY_ADDR));
 	else
-		scnprintf(str, len, "Linux NFSv4.0 %s/%s",
+		scnprintf(str, len, "Linux NFSv4.0 nconnect=%d %s/%s",
+			  clp->cl_nconnect,
 			  clp->cl_rpcclient->cl_nodename,
 			  rpc_peeraddr2str(clp->cl_rpcclient,
 					   RPC_DISPLAY_ADDR));
@@ -5994,7 +5996,7 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp,
 	size_t len;
 	char *str;
 
-	len = 10 + 10 + 1 + 10 + 1 +
+	len = 10 + 10 + 1 + 10 + 1 + 12 +
 		strlen(nfs4_client_id_uniquifier) + 1 +
 		strlen(clp->cl_rpcclient->cl_nodename) + 1;
 
@@ -6010,9 +6012,9 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp,
 	if (!str)
 		return -ENOMEM;
 
-	scnprintf(str, len, "Linux NFSv%u.%u %s/%s",
+	scnprintf(str, len, "Linux NFSv%u.%u nconnect=%d %s/%s",
 			clp->rpc_ops->version, clp->cl_minorversion,
-			nfs4_client_id_uniquifier,
+			clp->cl_nconnect, nfs4_client_id_uniquifier,
 			clp->cl_rpcclient->cl_nodename);
 	clp->cl_owner_id = str;
 	return 0;
@@ -6030,7 +6032,7 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp,
 	if (nfs4_client_id_uniquifier[0] != '\0')
 		return nfs4_init_uniquifier_client_string(clp);
 
-	len = 10 + 10 + 1 + 10 + 1 +
+	len = 10 + 10 + 1 + 10 + 1 + 12 +
 		strlen(clp->cl_rpcclient->cl_nodename) + 1;
 
 	if (len > NFS4_OPAQUE_LIMIT + 1)
@@ -6045,9 +6047,9 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp,
 	if (!str)
 		return -ENOMEM;
 
-	scnprintf(str, len, "Linux NFSv%u.%u %s",
+	scnprintf(str, len, "Linux NFSv%u.%u nconnect=%d %s",
 			clp->rpc_ops->version, clp->cl_minorversion,
-			clp->cl_rpcclient->cl_nodename);
+			clp->cl_nconnect, clp->cl_rpcclient->cl_nodename);
 	clp->cl_owner_id = str;
 	return 0;
 }
-- 
1.8.3.1