Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux (896abeb7) · Commits · e / devices / android_kernel_xiaomi_nabu

fs/lockd/svclock.c

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -427,7 +427,7 @@ nlmsvc_lock(struct svc_rqst rqstp, struct nlm_file file,
	goto out;		goto out;
	case -EAGAIN:		case -EAGAIN:
	ret = nlm_lck_denied;		ret = nlm_lck_denied;
	goto out;		break;
	case FILE_LOCK_DEFERRED:		case FILE_LOCK_DEFERRED:
	if (wait)		if (wait)
	break;		break;
	@@ -443,6 +443,10 @@ nlmsvc_lock(struct svc_rqst rqstp, struct nlm_file file,
	goto out;		goto out;
	}		}

			ret = nlm_lck_denied;
			if (!wait)
			goto out;

	ret = nlm_lck_blocked;		ret = nlm_lck_blocked;

	/* Append to list of blocked */		/* Append to list of blocked */