From f9b8580ee828369d84bbd0aa71302a5337600da7 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 18 Oct 2005 14:20:20 -0700
Subject: [PATCH] --- yaml --- r: 9984 b: refs/heads/master c:
 b8e5c4c2978fa666287525a9de2fa648a7581262 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfs/nfs4proc.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8216a15942e6..f979be3e466f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 642ac54923e0291ae2c8e42edde18d8c9c0a3c84
+refs/heads/master: b8e5c4c2978fa666287525a9de2fa648a7581262
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index c10dcd12af51..a8be9af610ac 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/fs/nfs/nfs4proc.c
@@ -658,6 +658,8 @@ static int _nfs4_open_delegated(struct inode *inode, int flags, struct rpc_cred
 	}
 	up_read(&nfsi->rwsem);
 	up_read(&clp->cl_sem);
+	if (err != -EACCES)
+		nfs_inode_return_delegation(inode);
 	return err;
 }