From: Chuck Lever <chuck.lever@oracle.com>
Date: Fri, 8 Jul 2022 18:25:44 +0000 (-0400)
Subject: NFSD: Remove lockdep assertion from unhash_and_release_locked()
X-Git-Tag: v5.15.154~335
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6a23d45e2ef4ec8033c3a2fae64aea435660ac2;p=thirdparty%2Fkernel%2Fstable.git

NFSD: Remove lockdep assertion from unhash_and_release_locked()

[ Upstream commit f53cef15dddec7203df702cdc62e554190385450 ]

IIUC, holding the hash bucket lock is needed only in
nfsd_file_unhash, and there is already a lockdep assertion there.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index 2d013a88e3565..6a01de8677959 100644
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -299,8 +299,6 @@ nfsd_file_unhash(struct nfsd_file *nf)
 static bool
 nfsd_file_unhash_and_release_locked(struct nfsd_file *nf, struct list_head *dispose)
 {
-	lockdep_assert_held(&nfsd_file_hashtbl[nf->nf_hashval].nfb_lock);
-
 	trace_nfsd_file_unhash_and_release_locked(nf);
 	if (!nfsd_file_unhash(nf))
 		return false;