From 3ce15c1c285ef57bb7a82b76efb1f9b470c75f7a Mon Sep 17 00:00:00 2001
From: Andy Adamson <andros@netapp.com>
Date: Fri, 22 Apr 2011 12:45:59 -0400
Subject: [PATCH] --- yaml --- r: 252823 b: refs/heads/master c:
 b7c66360dc34e64742edabf4dc410070aa883119 h: refs/heads/master i:   252821:
 cada60d033c9e41949a46876596811d6a487f394   252819:
 47b29c74ffd3ee1c7f2866c7d8a09bda8dbfd3cc   252815:
 e6602c994c73b2746cc72b1ebcabec909a2c0375 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfsd/nfs4xdr.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a723b69aed89..b5099ade91bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a62573dc353b255dbbc8520bfdcb1c8a8c1ada87
+refs/heads/master: b7c66360dc34e64742edabf4dc410070aa883119
diff --git a/trunk/fs/nfsd/nfs4xdr.c b/trunk/fs/nfsd/nfs4xdr.c
index c6766af00d98..6e7f10a89354 100644
--- a/trunk/fs/nfsd/nfs4xdr.c
+++ b/trunk/fs/nfsd/nfs4xdr.c
@@ -588,8 +588,6 @@ nfsd4_decode_lockt(struct nfsd4_compoundargs *argp, struct nfsd4_lockt *lockt)
 	READ_BUF(lockt->lt_owner.len);
 	READMEM(lockt->lt_owner.data, lockt->lt_owner.len);
 
-	if (argp->minorversion && !zero_clientid(&lockt->lt_clientid))
-		return nfserr_inval;
 	DECODE_TAIL;
 }