Skip to contentSkip to conversation

SQUASHME pnfs-submit wave3 fix nfs4_ds_connect bug

PATCH New [email protected] 1 participant 1 message Feb 8, 2011

Subsystems (2)
NFS client NFS server
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 29/29 SQUASHME pnfs-submit wave3 fix nfs4_ds_connect bug

From: Andy Adamson <[email protected]>

MDS/DS dual role nfs_client not assigned to the nfs4_pnfs_ds->clp

Signed-off-by Andy Adamson <[email protected]>
---
 fs/nfs/nfs4filelayoutdev.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
fs/nfs/nfs4filelayoutdev.c +3 -5
index 96e9e6a..673e31e 100644
@@ -131,13 +131,13 @@ nfs4_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds)
 	}
 
 	if ((clp->cl_exchange_flags & EXCHGID4_FLAG_MASK_PNFS) != 0) {
-		dprintk("%s [existing] ip=%x, port=%hu\n", __func__,
-			ntohl(ds->ds_ip_addr), ntohs(ds->ds_port));
-
 		if (!is_ds_client(clp)) {
 			status = -ENODEV;
 			goto out_put;
 		}
+		ds->ds_clp = clp;
+		dprintk("%s [existing] ip=%x, port=%hu\n", __func__,
+			ntohl(ds->ds_ip_addr), ntohs(ds->ds_port));
 		goto out;
 	}
 

@@ -155,9 +155,7 @@ nfs4_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds)
 	if (status)
 		goto out_put;
 
-
 	ds->ds_clp = clp;
-
 	dprintk("%s [new] ip=%x, port=%hu\n", __func__, ntohl(ds->ds_ip_addr),
 		ntohs(ds->ds_port));
 out:
Signature · 1 line
1.6.6