Return-Path: linux-nfs-owner@vger.kernel.org Received: from fieldses.org ([174.143.236.118]:52768 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755195Ab1LMWMK (ORCPT ); Tue, 13 Dec 2011 17:12:10 -0500 Date: Tue, 13 Dec 2011 17:12:09 -0500 From: "J. Bruce Fields" To: bjschuma@netapp.com Cc: linux-nfs@vger.kernel.org Subject: Re: [PATCH] NFSD: Only reinitilize the recall_lru list under the recall lock Message-ID: <20111213221209.GA30904@fieldses.org> References: <1323812158-5183-1-git-send-email-bjschuma@netapp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1323812158-5183-1-git-send-email-bjschuma@netapp.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: On Tue, Dec 13, 2011 at 04:35:58PM -0500, bjschuma@netapp.com wrote: > From: Bryan Schumaker > > unhash_delegation() will grab the recall lock before calling > list_del_init() in each of these places. This patch removes the > redundant calls. Looks right, thanks. (How did you happen across this?) --b. > > Signed-off-by: Bryan Schumaker > --- > fs/nfsd/nfs4state.c | 3 --- > 1 files changed, 0 insertions(+), 3 deletions(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 6ab6779..43d5c22 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -1058,7 +1058,6 @@ expire_client(struct nfs4_client *clp) > spin_unlock(&recall_lock); > while (!list_empty(&reaplist)) { > dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru); > - list_del_init(&dp->dl_recall_lru); > unhash_delegation(dp); > } > while (!list_empty(&clp->cl_openowners)) { > @@ -3125,7 +3124,6 @@ nfs4_laundromat(void) > spin_unlock(&recall_lock); > list_for_each_safe(pos, next, &reaplist) { > dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru); > - list_del_init(&dp->dl_recall_lru); > unhash_delegation(dp); > } > test_val = nfsd4_lease; > @@ -4667,7 +4665,6 @@ __nfs4_state_shutdown(void) > spin_unlock(&recall_lock); > list_for_each_safe(pos, next, &reaplist) { > dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru); > - list_del_init(&dp->dl_recall_lru); > unhash_delegation(dp); > } > > -- > 1.7.8 >