From: Andy Adamson <andros@xxxxxxxxxx>
Not used by the file layout driver
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
fs/nfs/nfs4xdr.c | 11 ++---------
include/linux/nfs4_pnfs.h | 3 ---
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index d7d41e9..72fd799 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -1852,8 +1852,6 @@ encode_layoutcommit(struct xdr_stream *xdr,
const struct pnfs_layoutcommit_arg *args,
struct compound_hdr *hdr)
{
- struct layoutdriver_io_operations *ld_io_ops =
- NFS_SERVER(args->inode)->pnfs_curr_ld->ld_io_ops;
__be32 *p;
dprintk("%s: %llu@%llu lbw: %llu type: %d\n", __func__,
@@ -1879,13 +1877,8 @@ encode_layoutcommit(struct xdr_stream *xdr,
p = reserve_space(xdr, 4);
*p = cpu_to_be32(args->layout_type);
- if (ld_io_ops->encode_layoutcommit)
- ld_io_ops->encode_layoutcommit(
- &NFS_I(args->inode)->layout, xdr, args);
- else {
- p = reserve_space(xdr, 4);
- xdr_encode_opaque(p, NULL, 0);
- }
+ p = reserve_space(xdr, 4);
+ xdr_encode_opaque(p, NULL, 0);
hdr->nops++;
hdr->replen += decode_layoutcommit_maxsz;
diff --git a/include/linux/nfs4_pnfs.h b/include/linux/nfs4_pnfs.h
index 1b017fe..3c22168 100644
--- a/include/linux/nfs4_pnfs.h
+++ b/include/linux/nfs4_pnfs.h
@@ -146,9 +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);
- void (*encode_layoutcommit) (struct pnfs_layout_type *layoutid,
- struct xdr_stream *xdr,
- const struct pnfs_layoutcommit_arg *args);
void (*encode_layoutreturn) (struct pnfs_layout_type *layoutid,
struct xdr_stream *xdr,
const struct nfs4_pnfs_layoutreturn_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
