nfs: remove the unused max_deviceinfo_size field from struct pnfs_layoutdriver_type

max_deviceinfo_size is not set anywhere, remove it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 1fc40afcbf1f506462d7c5fd2f060a4a99ff3457..30d2613e912b8804c994fc19e25b767f360ce51a 100644 (file)
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -133,7 +133,6 @@ struct pnfs_layoutdriver_type {
        const char *name;
        struct module *owner;
        unsigned flags;
-       unsigned max_deviceinfo_size;
        unsigned max_layoutget_response;
 
        int (*set_layoutdriver) (struct nfs_server *, const struct nfs_fh *);

diff --git a/fs/nfs/pnfs_dev.c b/fs/nfs/pnfs_dev.c
index 178001c90156fdb8dd107ae62821f0ebd56b27de..bf0f2d67e96c15febbc1bcc1af36ef50a8dcab77 100644 (file)
--- a/fs/nfs/pnfs_dev.c
+++ b/fs/nfs/pnfs_dev.c
@@ -110,9 +110,6 @@ nfs4_get_device_info(struct nfs_server *server,
         * GETDEVICEINFO's maxcount
         */
        max_resp_sz = server->nfs_client->cl_session->fc_attrs.max_resp_sz;
-       if (server->pnfs_curr_ld->max_deviceinfo_size &&
-           server->pnfs_curr_ld->max_deviceinfo_size < max_resp_sz)
-               max_resp_sz = server->pnfs_curr_ld->max_deviceinfo_size;
        max_pages = nfs_page_array_len(0, max_resp_sz);
        dprintk("%s: server %p max_resp_sz %u max_pages %d\n",
                __func__, server, max_resp_sz, max_pages);