lockd: get host reference in nlmsvc_create_block() instead of callers (560de0e6) · Commits · 戴 / test

It may not be obvious (till you look at the definition of nlm_alloc_call()) that a function like nlmsvc_create_block() should consume a reference on success or failure, so I find it clearer if it takes the reference it needs itself. And both callers already do this immediately before the call anyway. Signed-off-by:

J. Bruce Fields <bfields@citi.umich.edu>

fs/lockd/svclock.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -180,6 +180,7 @@ nlmsvc_create_block(struct svc_rqst rqstp, struct nlm_host host,
		struct nlm_block *block;
		struct nlm_rqst *call = NULL;

		nlm_get_host(host);
		call = nlm_alloc_call(host);
		if (call == NULL)
		return NULL;
		@@ -380,8 +381,7 @@ nlmsvc_lock(struct svc_rqst rqstp, struct nlm_file file,
		*/
		block = nlmsvc_lookup_block(file, lock);
		if (block == NULL) {
		block = nlmsvc_create_block(rqstp, nlm_get_host(host), file,
		lock, cookie);
		block = nlmsvc_create_block(rqstp, host, file, lock, cookie);
		ret = nlm_lck_denied_nolocks;
		if (block == NULL)
		goto out;
		@@ -476,7 +476,6 @@ nlmsvc_testlock(struct svc_rqst rqstp, struct nlm_file file,

		if (conf == NULL)
		return nlm_granted;
		nlm_get_host(host);
		block = nlmsvc_create_block(rqstp, host, file, lock, cookie);
		if (block == NULL) {
		kfree(conf);

Admin message