Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ddbbbfe authored by Mike Sager's avatar Mike Sager Committed by J. Bruce Fields
Browse files

nfsd41: Remove ip address collision detection case 



Verified that cthon and pynfs exchange id tests pass (except for the
two expected fails: EID8 and EID50)

Signed-off-by: default avatarMike Sager <sager@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 671e1fcf

fs/nfsd/nfs4state.c

+6 −12
Original line number Diff line number Diff line
@@ -1247,12 +1247,6 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, 
			expire_client(conf);

			goto out_new;

		}

		if (ip_addr != conf->cl_addr &&

		    !(exid->flags & EXCHGID4_FLAG_UPD_CONFIRMED_REC_A)) {

			/* Client collision. 18.35.4 case 3 */

			status = nfserr_clid_inuse;

			goto out;

		}

		/*

		 * Set bit when the owner id and verifier map to an already

		 * confirmed client id (18.35.3).
@@ -1266,13 +1260,13 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, 
		copy_verf(conf, &verf);

		new = conf;

		goto out_copy;

	} else {

	}



	/* 18.35.4 case 7 */

	if (exid->flags & EXCHGID4_FLAG_UPD_CONFIRMED_REC_A) {

		status = nfserr_noent;

		goto out;

	}

	}



	unconf  = find_unconfirmed_client_by_str(dname, strhashval, true);

	if (unconf) {