From: J. Bruce Fields <bfields@redhat.com>
Date: Tue, 27 May 2014 15:14:26 +0000 (-0400)
Subject: nfsd4: fix FREE_STATEID lockowner leak
X-Git-Tag: firefly_0821_release~3679^2~1926
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1dd6ffc6284cd2d81b667e58684701cf7d1c3d12;p=firefly-linux-kernel-4.4.55.git

nfsd4: fix FREE_STATEID lockowner leak

commit 48385408b45523d9a432c66292d47ef43efcbb94 upstream.

27b11428b7de ("nfsd4: remove lockowner when removing lock stateid")
introduced a memory leak.

Reported-by: Jeff Layton <jeff.layton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index ae6a50b7a617..bdff771057d3 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -3608,7 +3608,7 @@ nfsd4_free_lock_stateid(struct nfs4_ol_stateid *stp)
 	 * correspondance, and we have to delete the lockowner when we
 	 * delete the lock stateid:
 	 */
-	unhash_lockowner(lo);
+	release_lockowner(lo);
 	return nfs_ok;
 }