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

Commit f1ee4f22 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] nfsd4: callback create rpc client returns 



rpc_create_clnt and friends return errors, not NULL, on failure.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9e416052

fs/nfsd/nfs4callback.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -405,7 +405,8 @@ nfsd4_probe_callback(struct nfs4_client *clp) 
	timeparms.to_exponential = 1;

	timeparms.to_exponential = 1;





	/* Create RPC transport */

	/* Create RPC transport */

	if (!(xprt = xprt_create_proto(IPPROTO_TCP, &addr, &timeparms))) {

	xprt = xprt_create_proto(IPPROTO_TCP, &addr, &timeparms);

	if (IS_ERR(xprt)) {

		dprintk("NFSD: couldn't create callback transport!\n");

		dprintk("NFSD: couldn't create callback transport!\n");

		goto out_err;

		goto out_err;

	}

	}
@@ -426,7 +427,8 @@ nfsd4_probe_callback(struct nfs4_client *clp) 
	 * XXX AUTH_UNIX only - need AUTH_GSS....

	 * XXX AUTH_UNIX only - need AUTH_GSS....

	 */

	 */

	sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(addr.sin_addr.s_addr));

	sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(addr.sin_addr.s_addr));

	if (!(clnt = rpc_create_client(xprt, hostname, program, 1, RPC_AUTH_UNIX))) {

	clnt = rpc_create_client(xprt, hostname, program, 1, RPC_AUTH_UNIX);

	if (IS_ERR(clnt)) {

		dprintk("NFSD: couldn't create callback client\n");

		dprintk("NFSD: couldn't create callback client\n");

		goto out_xprt;

		goto out_xprt;

	}

	}