From: andros@netapp.com Subject: [PATCH 1/6] SQUASHME pnfs-submit: remove setup_layoutcommit Date: Wed, 2 Jun 2010 11:54:22 -0400 Message-ID: <1275494067-4058-2-git-send-email-andros@netapp.com> References: <1275494067-4058-1-git-send-email-andros@netapp.com> Cc: linux-nfs@vger.kernel.org, Andy Adamson To: bhalevy@panasas.com Return-path: Received: from mx2.netapp.com ([216.240.18.37]:38483 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758167Ab0FBRzZ (ORCPT ); Wed, 2 Jun 2010 13:55:25 -0400 In-Reply-To: <1275494067-4058-1-git-send-email-andros@netapp.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: From: Andy Adamson Not used by the file layout driver Signed-off-by: Andy Adamson --- fs/nfs/pnfs.c | 7 ------- include/linux/nfs4_pnfs.h | 2 -- 2 files changed, 0 insertions(+), 9 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 8cc4412..23787ff 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1944,7 +1944,6 @@ pnfs_layoutcommit_setup(struct inode *inode, struct pnfs_layoutcommit_data *data, loff_t write_begin_pos, loff_t write_end_pos, int sync) { - struct nfs_inode *nfsi = NFS_I(inode); struct nfs_server *nfss = NFS_SERVER(inode); int result = 0; @@ -1970,12 +1969,6 @@ pnfs_layoutcommit_setup(struct inode *inode, data->args.bitmask = nfss->attr_bitmask; data->res.server = nfss; - /* Call layout driver to set the arguments. - */ - if (nfss->pnfs_curr_ld->ld_io_ops->setup_layoutcommit) - result = nfss->pnfs_curr_ld->ld_io_ops->setup_layoutcommit( - &nfsi->layout, &data->args); - dprintk("%s End Status %d\n", __func__, result); return result; } diff --git a/include/linux/nfs4_pnfs.h b/include/linux/nfs4_pnfs.h index 84d2e95..cab9137 100644 --- a/include/linux/nfs4_pnfs.h +++ b/include/linux/nfs4_pnfs.h @@ -146,8 +146,6 @@ struct layoutdriver_io_operations { struct pnfs_layout_segment * (*alloc_lseg) (struct pnfs_layout_type *layoutid, struct nfs4_pnfs_layoutget_res *lgr); void (*free_lseg) (struct pnfs_layout_segment *lseg); - int (*setup_layoutcommit) (struct pnfs_layout_type *layoutid, - struct pnfs_layoutcommit_arg *args); void (*encode_layoutcommit) (struct pnfs_layout_type *layoutid, struct xdr_stream *xdr, const struct pnfs_layoutcommit_arg *args); -- 1.6.6