NFS: Remove unused fields in the page I/O structures

Remove the 'layout_private' fields that were only used by the pNFS OSD
layout driver.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index ad92b401326c69a154b514b11764a2bc4a04a1cb..de107d866297b5fda31d3a7c3473c812b56600ab 100644 (file)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -51,7 +51,6 @@ void nfs_pgheader_init(struct nfs_pageio_descriptor *desc,
        hdr->io_start = req_offset(hdr->req);
        hdr->good_bytes = mirror->pg_count;
        hdr->dreq = desc->pg_dreq;
-       hdr->layout_private = desc->pg_layout_private;
        hdr->release = release;
        hdr->completion_ops = desc->pg_completion_ops;
        if (hdr->completion_ops->init_hdr)
@@ -711,7 +710,6 @@ void nfs_pageio_init(struct nfs_pageio_descriptor *desc,
        desc->pg_error = 0;
        desc->pg_lseg = NULL;
        desc->pg_dreq = NULL;
-       desc->pg_layout_private = NULL;
        desc->pg_bsize = bsize;
 
        desc->pg_mirror_count = 1;

diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 247cc3d3498f241b19f57b486685986b81d95e56..6138cf91346b8064aa40ed9a538273ee329b70db 100644 (file)
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -94,7 +94,6 @@ struct nfs_pageio_descriptor {
        const struct nfs_pgio_completion_ops *pg_completion_ops;
        struct pnfs_layout_segment *pg_lseg;
        struct nfs_direct_req   *pg_dreq;
-       void                    *pg_layout_private;
        unsigned int            pg_bsize;       /* default bsize for mirrors */
 
        u32                     pg_mirror_count;

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 9463eeff9e3c8057ea3ae0395dc197271cfe97ba..7f1e04941763beb037bc98dc061c2d2f1ed2d087 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1436,7 +1436,6 @@ struct nfs_pgio_header {
        const struct nfs_pgio_completion_ops *completion_ops;
        const struct nfs_rw_ops *rw_ops;
        struct nfs_direct_req   *dreq;
-       void                    *layout_private;
        spinlock_t              lock;
        /* fields protected by lock */
        int                     pnfs_error;