From patchwork Thu Apr 14 19:04:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weston Andros Adamson X-Patchwork-Id: 709411 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3EJ4jEm008605 for ; Thu, 14 Apr 2011 19:04:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932935Ab1DNTEo (ORCPT ); Thu, 14 Apr 2011 15:04:44 -0400 Received: from mx2.netapp.com ([216.240.18.37]:11344 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932735Ab1DNTEn (ORCPT ); Thu, 14 Apr 2011 15:04:43 -0400 X-IronPort-AV: E=Sophos;i="4.64,212,1301900400"; d="scan'208";a="541422896" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 14 Apr 2011 12:04:28 -0700 Received: from drosapp.netapp.com (vpn2ntap-507147.hq.netapp.com [10.58.62.83] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p3EJ4NYx011609; Thu, 14 Apr 2011 12:04:25 -0700 (PDT) From: Weston Andros Adamson To: trond@netapp.com Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson Subject: [PATCH] NFS: dont restart loop in nfs_delegation_reap_unclaimed Date: Thu, 14 Apr 2011 15:04:15 -0400 Message-Id: <1302807855-84959-1-git-send-email-dros@netapp.com> X-Mailer: git-send-email 1.7.4.2 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 14 Apr 2011 19:04:45 +0000 (UTC) The loop was being restarted after each delegation that has NFS_DELEGATION_NEED_RECLAIM set. Instead, build a temporary list of delegations that need to be freed and free them after the for-each-delegation loop. Signed-off-by: Weston Andros Adamson --- fs/nfs/delegation.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index bbbc6bf..c87fad8 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -645,8 +645,8 @@ void nfs_delegation_reap_unclaimed(struct nfs_client *clp) struct nfs_delegation *delegation; struct nfs_server *server; struct inode *inode; + LIST_HEAD(tmplist); -restart: rcu_read_lock(); list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link) { list_for_each_entry_rcu(delegation, &server->delegations, @@ -659,15 +659,21 @@ restart: continue; delegation = nfs_detach_delegation(NFS_I(inode), server); - rcu_read_unlock(); - + /* super_list is unused now that deleg is detached */ if (delegation != NULL) - nfs_free_delegation(delegation); + list_add(&delegation->super_list, &tmplist); + iput(inode); - goto restart; } } rcu_read_unlock(); + + while (!list_empty(&tmplist)) { + delegation = list_first_entry(&tmplist, struct nfs_delegation, + super_list); + list_del(&delegation->super_list); + nfs_free_delegation(delegation); + } } /**