diff options
| author | Alex Elder <elder@inktank.com> | 2013-03-01 18:00:15 -0600 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-01 21:16:16 -0700 |
| commit | ec02a2f2ffae13e038453ae89592a8c6210f7f4d (patch) | |
| tree | 9c9d59d61ec2b5516ccfd7da02caf5372bf72e8c | |
| parent | 2a24d1f4bd7995de133c857bfdc77ac82c842300 (diff) | |
| download | linux-3.10-ec02a2f2ffae13e038453ae89592a8c6210f7f4d.tar.gz linux-3.10-ec02a2f2ffae13e038453ae89592a8c6210f7f4d.tar.bz2 linux-3.10-ec02a2f2ffae13e038453ae89592a8c6210f7f4d.zip | |
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>
| -rw-r--r-- | fs/ceph/mds_client.c | 1 | ||||
| -rw-r--r-- | include/linux/ceph/messenger.h | 1 | ||||
| -rw-r--r-- | net/ceph/messenger.c | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 9811caae7be..4efbc63e0bb 100644 --- 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 1b08349a413..6c118748a7f 100644 --- 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 9d8abb0a7ce..0f9933a5a8b 100644 --- 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; |