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

Commit 686517f1 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

lockd: Make nlmsvc_create_block() use nlmsvc_lookup_host() 



Currently it uses nlmclnt_lookup_host(), which puts the resulting host
structure on a different list.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 5e1abf8c

fs/lockd/svc4proc.c

+1 −2
Original line number Diff line number Diff line
@@ -483,8 +483,7 @@ nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_res *resp) 
	if (!(call = nlmclnt_alloc_call()))

		return rpc_system_err;



	host = nlmclnt_lookup_host(&rqstp->rq_addr,

				rqstp->rq_prot, rqstp->rq_vers);

	host = nlmsvc_lookup_host(rqstp);

	if (!host) {

		kfree(call);

		return rpc_system_err;

fs/lockd/svclock.c

+1 −2
Original line number Diff line number Diff line
@@ -185,8 +185,7 @@ nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_file *file, 
	struct nlm_rqst		*call;



	/* Create host handle for callback */

	host = nlmclnt_lookup_host(&rqstp->rq_addr,

				rqstp->rq_prot, rqstp->rq_vers);

	host = nlmsvc_lookup_host(rqstp);

	if (host == NULL)

		return NULL;

fs/lockd/svcproc.c

+1 −2
Original line number Diff line number Diff line
@@ -508,8 +508,7 @@ nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_res *resp) 
	if (!(call = nlmclnt_alloc_call()))

		return rpc_system_err;



	host = nlmclnt_lookup_host(&rqstp->rq_addr,

				rqstp->rq_prot, rqstp->rq_vers);

	host = nlmsvc_lookup_host(rqstp);

	if (!host) {

		kfree(call);

		return rpc_system_err;