From patchwork Fri Jul 29 03:16:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 1018892 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6T3GjOK015914 for ; Fri, 29 Jul 2011 03:16:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751535Ab1G2DQo (ORCPT ); Thu, 28 Jul 2011 23:16:44 -0400 Received: from merit-proxy02.merit.edu ([207.75.116.194]:35052 "EHLO merit-proxy02.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751175Ab1G2DQo (ORCPT ); Thu, 28 Jul 2011 23:16:44 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by merit-proxy02.merit.edu (Postfix) with ESMTP id 4DD7F2039B1F; Thu, 28 Jul 2011 23:16:43 -0400 (EDT) X-Virus-Scanned: amavisd-new at merit-proxy02.merit.edu Received: from merit-proxy02.merit.edu ([127.0.0.1]) by localhost (merit-proxy02.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8cHJ0HUGPlpH; Thu, 28 Jul 2011 23:16:42 -0400 (EDT) Received: from merit.edu (modemcable010.3-70-69.static.videotron.ca [69.70.3.10]) by merit-proxy02.merit.edu (Postfix) with ESMTPSA id ED6C42039B0A; Thu, 28 Jul 2011 23:16:41 -0400 (EDT) Date: Thu, 28 Jul 2011 23:16:50 -0400 From: Jim Rees To: Boaz Harrosh Cc: Trond Myklebust , linux-nfs@vger.kernel.org, peter honeyman Subject: Re: [PATCH v4 09/27] pnfs: cleanup_layoutcommit Message-ID: <20110729031650.GA19579@merit.edu> References: <1311874276-1386-1-git-send-email-rees@umich.edu> <1311874276-1386-10-git-send-email-rees@umich.edu> <4E31A9F3.9090205@panasas.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4E31A9F3.9090205@panasas.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, 29 Jul 2011 03:16:46 +0000 (UTC) Boaz Harrosh wrote: On 07/28/2011 10:30 AM, Jim Rees wrote: > From: Andy Adamson > > This gives layout driver a chance to cleanup structures they put in at > encode_layoutcommit. > > Signed-off-by: Andy Adamson > [fixup layout header pointer for layoutcommit] > Signed-off-by: Benny Halevy > Signed-off-by: Benny Halevy > --- > fs/nfs/nfs4proc.c | 1 + > fs/nfs/nfs4xdr.c | 1 + > fs/nfs/pnfs.c | 10 ++++++++++ > fs/nfs/pnfs.h | 5 +++++ > include/linux/nfs_xdr.h | 1 + > 5 files changed, 18 insertions(+), 0 deletions(-) > > diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c > index e86de79..6cb84b4 100644 > --- a/fs/nfs/nfs4proc.c > +++ b/fs/nfs/nfs4proc.c > @@ -5963,6 +5963,7 @@ static void nfs4_layoutcommit_release(void *calldata) > struct nfs4_layoutcommit_data *data = calldata; > struct pnfs_layout_segment *lseg, *tmp; > > + pnfs_cleanup_layoutcommit(data->args.inode, data); If inode is part of @data, which is also passed as argument then we can simplify the API by just passing @data Thanks, I've applied the following patch, which will be squashed and included in the next version of the patch set. Which I will probably send tomorrow. From b757a45f208f31f8eff5ec499f1e99895713a17c Mon Sep 17 00:00:00 2001 From: Jim Rees Date: Thu, 28 Jul 2011 15:26:49 -0400 Subject: [PATCH] SQUASHME: rm inode and pnfs_layout_hdr args from cleanup_layoutcommit() Signed-off-by: Jim Rees --- fs/nfs/blocklayout/blocklayout.c | 5 +++-- fs/nfs/nfs4proc.c | 2 +- fs/nfs/pnfs.c | 8 +++----- fs/nfs/pnfs.h | 6 ++---- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index 81efa05..7450309 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -771,9 +771,10 @@ bl_encode_layoutcommit(struct pnfs_layout_hdr *lo, struct xdr_stream *xdr, } static void -bl_cleanup_layoutcommit(struct pnfs_layout_hdr *lo, - struct nfs4_layoutcommit_data *lcdata) +bl_cleanup_layoutcommit(struct nfs4_layoutcommit_data *lcdata) { + struct pnfs_layout_hdr *lo = NFS_I(lcdata->args.inode)->layout; + dprintk("%s enter\n", __func__); clean_pnfs_block_layoutupdate(BLK_LO2EXT(lo), &lcdata->args, lcdata->res.status); } diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 6cb84b4..8c77039 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5963,7 +5963,7 @@ static void nfs4_layoutcommit_release(void *calldata) struct nfs4_layoutcommit_data *data = calldata; struct pnfs_layout_segment *lseg, *tmp; - pnfs_cleanup_layoutcommit(data->args.inode, data); + pnfs_cleanup_layoutcommit(data); /* Matched by references in pnfs_set_layoutcommit */ list_for_each_entry_safe(lseg, tmp, &data->lseg_list, pls_lc_list) { list_del_init(&lseg->pls_lc_list); diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index c1cc216..e550e88 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1411,14 +1411,12 @@ pnfs_set_layoutcommit(struct nfs_write_data *wdata) } EXPORT_SYMBOL_GPL(pnfs_set_layoutcommit); -void pnfs_cleanup_layoutcommit(struct inode *inode, - struct nfs4_layoutcommit_data *data) +void pnfs_cleanup_layoutcommit(struct nfs4_layoutcommit_data *data) { - struct nfs_server *nfss = NFS_SERVER(inode); + struct nfs_server *nfss = NFS_SERVER(data->args.inode); if (nfss->pnfs_curr_ld->cleanup_layoutcommit) - nfss->pnfs_curr_ld->cleanup_layoutcommit(NFS_I(inode)->layout, - data); + nfss->pnfs_curr_ld->cleanup_layoutcommit(data); } /* diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 82dde37..e0b5d80 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -113,8 +113,7 @@ struct pnfs_layoutdriver_type { struct xdr_stream *xdr, const struct nfs4_layoutreturn_args *args); - void (*cleanup_layoutcommit) (struct pnfs_layout_hdr *layoutid, - struct nfs4_layoutcommit_data *data); + void (*cleanup_layoutcommit) (struct nfs4_layoutcommit_data *data); void (*encode_layoutcommit) (struct pnfs_layout_hdr *layoutid, struct xdr_stream *xdr, @@ -198,8 +197,7 @@ void pnfs_roc_release(struct inode *ino); void pnfs_roc_set_barrier(struct inode *ino, u32 barrier); bool pnfs_roc_drain(struct inode *ino, u32 *barrier); void pnfs_set_layoutcommit(struct nfs_write_data *wdata); -void pnfs_cleanup_layoutcommit(struct inode *inode, - struct nfs4_layoutcommit_data *data); +void pnfs_cleanup_layoutcommit(struct nfs4_layoutcommit_data *data); int pnfs_layoutcommit_inode(struct inode *inode, bool sync); int _pnfs_return_layout(struct inode *); int pnfs_ld_write_done(struct nfs_write_data *);