Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec02a2f2 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

libceph: kill ceph_msg->pagelist_count 



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

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 2a24d1f4

fs/ceph/mds_client.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/ceph/messenger.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

net/ceph/messenger.c

+0 −2
Original line number Diff line number Diff line
@@ -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;