From patchwork Fri Feb 11 01:52:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 550241 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 p1BI0iWB025866 for ; Fri, 11 Feb 2011 18:00:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757855Ab1BKSAv (ORCPT ); Fri, 11 Feb 2011 13:00:51 -0500 Received: from mx2.netapp.com ([216.240.18.37]:51336 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757802Ab1BKSAp (ORCPT ); Fri, 11 Feb 2011 13:00:45 -0500 X-IronPort-AV: E=Sophos;i="4.60,456,1291622400"; d="scan'208";a="517277623" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 11 Feb 2011 10:00:42 -0800 Received: from localhost.localdomain (lacsina2-lxp.hq.netapp.com [10.58.58.196] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p1BI0PWK026041; Fri, 11 Feb 2011 10:00:42 -0800 (PST) From: andros@netapp.com To: bhalevy@panasas.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH 16/17] SQUASHME restore lost put_lseg code Date: Thu, 10 Feb 2011 20:52:49 -0500 Message-Id: <1297389170-26702-17-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1297389170-26702-16-git-send-email-andros@netapp.com> References: <1297389170-26702-1-git-send-email-andros@netapp.com> <1297389170-26702-2-git-send-email-andros@netapp.com> <1297389170-26702-3-git-send-email-andros@netapp.com> <1297389170-26702-4-git-send-email-andros@netapp.com> <1297389170-26702-5-git-send-email-andros@netapp.com> <1297389170-26702-6-git-send-email-andros@netapp.com> <1297389170-26702-7-git-send-email-andros@netapp.com> <1297389170-26702-8-git-send-email-andros@netapp.com> <1297389170-26702-9-git-send-email-andros@netapp.com> <1297389170-26702-10-git-send-email-andros@netapp.com> <1297389170-26702-11-git-send-email-andros@netapp.com> <1297389170-26702-12-git-send-email-andros@netapp.com> <1297389170-26702-13-git-send-email-andros@netapp.com> <1297389170-26702-14-git-send-email-andros@netapp.com> <1297389170-26702-15-git-send-email-andros@netapp.com> <1297389170-26702-16-git-send-email-andros@netapp.com> 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]); Fri, 11 Feb 2011 18:00:53 +0000 (UTC) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 31e5f55..dc15a76 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -278,9 +278,12 @@ put_lseg(struct pnfs_layout_segment *lseg) test_bit(NFS_LSEG_VALID, &lseg->pls_flags)); ino = lseg->pls_layout->plh_inode; if (atomic_dec_and_lock(&lseg->pls_refcount, &ino->i_lock)) { + LIST_HEAD(free_me); + _put_lseg_common(lseg); + list_add(&lseg->pls_list, &free_me); spin_unlock(&ino->i_lock); - free_lseg(lseg); + pnfs_free_lseg_list(&free_me); } } EXPORT_SYMBOL_GPL(put_lseg);