nfsd4: merge last two setclientid cases (ad72aae5) · Commits · 戴 / test

fs/nfsd/nfs4state.c

+4 −9

Original line number	Diff line number	Diff line
		@@ -2212,14 +2212,9 @@ nfsd4_setclientid(struct svc_rqst rqstp, struct nfsd4_compound_state cstate,
		if (new == NULL)
		goto out;
		copy_clid(new, conf);
		} else if (!unconf) {
		/* case 2: probable client reboot: */
		new = create_client(clname, dname, rqstp, &clverifier);
		if (new == NULL)
		goto out;
		gen_clid(new);
		} else {
		/* case 3: probable client reboot: */
		} else { /* conf && !same_verf(): */
		/* cases 2, 3: probable client reboot: */
		if (unconf)
		expire_client(unconf);
		new = create_client(clname, dname, rqstp, &clverifier);
		if (new == NULL)