From 5647993cc5ff601d569fc33cc3551ea8f949e931 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@citi.umich.edu>
Date: Sat, 14 Mar 2009 16:38:41 -0400
Subject: [PATCH] --- yaml --- r: 142168 b: refs/heads/master c:
 5cb031b0afddad73ea4191c9f0b76d20ca447dc0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0a355c6ebc5a..c14780fb75bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05f4f678b0511a24795a017b5332455077be3b1c
+refs/heads/master: 5cb031b0afddad73ea4191c9f0b76d20ca447dc0
diff --git a/trunk/fs/nfsd/nfs4proc.c b/trunk/fs/nfsd/nfs4proc.c
index 36d74cda87a8..f156b85b4129 100644
--- a/trunk/fs/nfsd/nfs4proc.c
+++ b/trunk/fs/nfsd/nfs4proc.c
@@ -206,10 +206,6 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 
 	switch (open->op_claim_type) {
 		case NFS4_OPEN_CLAIM_DELEGATE_CUR:
-			status = nfserr_inval;
-			if (open->op_create)
-				goto out;
-			/* fall through */
 		case NFS4_OPEN_CLAIM_NULL:
 			/*
 			 * (1) set CURRENT_FH to the file being opened,