From patchwork Wed Mar 23 13:27:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fred Isaman X-Patchwork-Id: 655671 X-Patchwork-Delegate: Trond.Myklebust@netapp.com 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 p2NDS4L7031555 for ; Wed, 23 Mar 2011 13:28:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932906Ab1CWN2H (ORCPT ); Wed, 23 Mar 2011 09:28:07 -0400 Received: from mx2.netapp.com ([216.240.18.37]:19426 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932884Ab1CWN2F (ORCPT ); Wed, 23 Mar 2011 09:28:05 -0400 X-IronPort-AV: E=Sophos;i="4.63,231,1299484800"; d="scan'208";a="533610339" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 23 Mar 2011 06:28:05 -0700 Received: from localhost.localdomain (pmora01-lxp.hq.netapp.com [10.58.61.135] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p2NDS0dD011685; Wed, 23 Mar 2011 06:28:04 -0700 (PDT) From: Fred Isaman To: linux-nfs@vger.kernel.org Cc: Trond Myklebust Subject: [PATCH 06/12] NFSv4.1: shift filelayout_free_lseg Date: Wed, 23 Mar 2011 09:27:49 -0400 Message-Id: <1300886875-5016-7-git-send-email-iisaman@netapp.com> X-Mailer: git-send-email 1.7.2.1 In-Reply-To: <1300886875-5016-1-git-send-email-iisaman@netapp.com> References: <1300886875-5016-1-git-send-email-iisaman@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]); Wed, 23 Mar 2011 13:28:10 +0000 (UTC) diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 4285584..9401afd 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -496,6 +496,16 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo, return 0; } +static void +filelayout_free_lseg(struct pnfs_layout_segment *lseg) +{ + struct nfs4_filelayout_segment *fl = FILELAYOUT_LSEG(lseg); + + dprintk("--> %s\n", __func__); + nfs4_fl_put_deviceid(fl->dsaddr); + _filelayout_free_lseg(fl); +} + static struct pnfs_layout_segment * filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, struct nfs4_layoutget_res *lgr) @@ -517,16 +527,6 @@ filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, return &fl->generic_hdr; } -static void -filelayout_free_lseg(struct pnfs_layout_segment *lseg) -{ - struct nfs4_filelayout_segment *fl = FILELAYOUT_LSEG(lseg); - - dprintk("--> %s\n", __func__); - nfs4_fl_put_deviceid(fl->dsaddr); - _filelayout_free_lseg(fl); -} - /* * filelayout_pg_test(). Called by nfs_can_coalesce_requests() *