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

Commit 896abeb7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux 

* 'for-2.6.29' of git://linux-nfs.org/~bfields/linux:
  lockd: fix regression in lockd's handling of blocked locks
parents f06da264 9d9b87c1

fs/lockd/svclock.c

+5 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, 
			goto out;

		case -EAGAIN:

			ret = nlm_lck_denied;

			goto out;

			break;

		case FILE_LOCK_DEFERRED:

			if (wait)

				break;
@@ -443,6 +443,10 @@ 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 */