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

Commit e33d1ea6 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by J. Bruce Fields
Browse files

lockd: clean up blocking lock cases of nlsmvc_lock() 



No change in behavior, just rearranging the switch so that we break out
of the switch if and only if we're in the wait case.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent e37da04e

fs/lockd/svclock.c

+8 −5
Original line number Diff line number Diff line
@@ -426,8 +426,15 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, 
			ret = nlm_granted;

			goto out;

		case -EAGAIN:

			ret = nlm_lck_denied;

			/*

			 * If this is a blocking request for an

			 * already pending lock request then we need

			 * to put it back on lockd's block list

			 */

			if (wait)

				break;

			ret = nlm_lck_denied;

			goto out;

		case FILE_LOCK_DEFERRED:

			if (wait)

				break;
@@ -443,10 +450,6 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, 
			goto out;

	}



	ret = nlm_lck_denied;

	if (!wait)

		goto out;



	ret = nlm_lck_blocked;



	/* Append to list of blocked */