From: Andy Adamson <andros@xxxxxxxxxx>
Not used by the file layout driver
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
