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

Commit f232142c authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Trond Myklebust
Browse files

NLM: Clean up nlmsvc_grant_reply locking 



 Slightly simpler logic here makes it more trivial to verify that the up's
 and down's are balanced here.  Break out an assignment from a conditional
 while we're at it.

 Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
 Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent fb459f45

fs/lockd/svclock.c

+3 −4
Original line number Diff line number Diff line
@@ -637,11 +637,12 @@ nlmsvc_grant_reply(struct svc_rqst *rqstp, struct nlm_cookie *cookie, u32 status 


	file->f_count++;

	down(&file->f_sema);

	if ((block = nlmsvc_find_block(cookie,&rqstp->rq_addr)) != NULL) {

	block = nlmsvc_find_block(cookie, &rqstp->rq_addr);

	if (block) {

		if (status == NLM_LCK_DENIED_GRACE_PERIOD) {

			/* Try again in a couple of seconds */

			nlmsvc_insert_block(block, 10 * HZ);

			block = NULL;

			up(&file->f_sema);

		} else {

			/* Lock is now held by client, or has been rejected.

			 * In both cases, the block should be removed. */
@@ -652,8 +653,6 @@ nlmsvc_grant_reply(struct svc_rqst *rqstp, struct nlm_cookie *cookie, u32 status 
				nlmsvc_delete_block(block, 1);

		}

	}

	if (!block)

		up(&file->f_sema);

	nlm_release_file(file);

}