From: Benny Halevy <bhalevy@primarydata.com>
Date: Tue, 15 Oct 2013 06:57:55 +0000 (+0300)
Subject: nfsd: nfs4_open_delegation needs to remove_stid rather than unhash_stid
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5d7dab83e3e55e81a88c406da71afde0ebaa6ad8;p=linux-beck.git

nfsd: nfs4_open_delegation needs to remove_stid rather than unhash_stid

In the out_free: path, the newly allocated stid must be removed rather
than unhashed so it can never be found.

Signed-off-by: Benny Halevy <bhalevy@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 9cb1b17014f5..3feb38e818ab 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3159,7 +3159,7 @@ nfs4_open_delegation(struct net *net, struct svc_fh *fh,
 	open->op_delegate_type = NFS4_OPEN_DELEGATE_READ;
 	return;
 out_free:
-	unhash_stid(&dp->dl_stid);
+	remove_stid(&dp->dl_stid);
 	nfs4_put_delegation(dp);
 out_no_deleg:
 	open->op_delegate_type = NFS4_OPEN_DELEGATE_NONE;