nfsd41: Remove ip address collision detection case (6ddbbbfe) · Commits · 戴 / test

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

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) {