libceph: kill ceph_msg->pagelist_count

The pagelist_count field is never actually used, so get rid of it.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 9811caae7be43fd3a7784f28c19f9aaa7f967b57..4efbc63e0bb6159f387a8e9fdc3aecd99f4d53e5 100644 (file)
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2604,7 +2604,6 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc,
        }
 
        reply->pagelist = pagelist;
-       reply->pagelist_count = calc_pages_for(0, pagelist->length);
        if (recon_state.flock)
                reply->hdr.version = cpu_to_le16(2);
        reply->hdr.data_len = cpu_to_le32(pagelist->length);

diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index 1b08349a413c95b612411177fd45674194418bbc..6c118748a7f8f280cb4febe4565bf30280fb91c7 100644 (file)
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -78,7 +78,6 @@ struct ceph_msg {
        unsigned page_count;            /* size of page array */
        unsigned page_alignment;        /* io offset in first page */
        struct ceph_pagelist *pagelist; /* instead of pages */
-       unsigned int pagelist_count;    /* number of pages in pagelist */
 
        struct ceph_connection *con;
        struct list_head list_head;

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 9d8abb0a7cef19891200be35ce681b26fe4a9914..0f9933a5a8b0f91e708d934b2bbac458eacd2c7e 100644 (file)
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -2718,7 +2718,6 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,
        m->page_count = 0;
        m->page_alignment = 0;
        m->pages = NULL;
-       m->pagelist_count = 0;
        m->pagelist = NULL;
 #ifdef CONFIG_BLOCK
        m->bio = NULL;
@@ -2898,7 +2897,6 @@ void ceph_msg_last_put(struct kref *kref)
                ceph_pagelist_release(m->pagelist);
                kfree(m->pagelist);
                m->pagelist = NULL;
-               m->pagelist_count = 0;
        }
 
        m->trail = NULL;