From: Alex Elder <elder@inktank.com>
To: ceph-devel@vger.kernel.org
Subject: [PATCH 2/3] libceph: kill ceph_msg->pagelist_count
Date: Mon, 04 Mar 2013 12:09:28 -0600 [thread overview]
Message-ID: <5134E358.50309@inktank.com> (raw)
In-Reply-To: <5134E30E.2090400@inktank.com>
The pagelist_count field is never actually used, so get rid of it.
Signed-off-by: Alex Elder <elder@inktank.com>
---
fs/ceph/mds_client.c | 1 -
include/linux/ceph/messenger.h | 1 -
net/ceph/messenger.c | 2 --
3 files changed, 4 deletions(-)
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 44435c2..76b7344 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2600,7 +2600,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 1b08349..6c11874 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 9d8abb0..0f9933a 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;
--
1.7.9.5
next prev parent reply other threads:[~2013-03-04 18:09 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-04 18:05 OSD Data Read/Write Separation Patches Alex Elder
2013-03-04 18:08 ` [PATCH 0/3] libceph: a few cleanups Alex Elder
2013-03-04 18:09 ` [PATCH 1/3] libceph: use (void *) for untyped data in osd ops Alex Elder
2013-03-04 18:09 ` Alex Elder [this message]
2013-03-04 18:09 ` [PATCH 3/3] libceph: rename ceph_calc_object_layout() Alex Elder
2013-03-05 1:49 ` [PATCH 0/3] libceph: a few cleanups Josh Durgin
2013-03-04 18:10 ` [PATCH 0/3] libceph: simplify incoming message allocation Alex Elder
2013-03-04 18:12 ` [PATCH 1/3] libceph: drop mutex while allocating a message Alex Elder
2013-03-04 19:07 ` Gregory Farnum
2013-03-04 19:25 ` Alex Elder
2013-03-04 19:39 ` Gregory Farnum
2013-03-04 19:52 ` Alex Elder
2013-03-04 18:12 ` [PATCH 2/3] libceph: define mds_alloc_msg() method Alex Elder
2013-03-04 19:05 ` Gregory Farnum
2013-03-04 19:37 ` Alex Elder
2013-03-04 18:12 ` [PATCH 3/3] libceph: no need for alignment for mds message Alex Elder
2013-03-04 19:09 ` Gregory Farnum
2013-03-04 18:14 ` [PATCH 0/3] ceph: assign message data fields consistently Alex Elder
2013-03-04 18:15 ` [PATCH 1/3] ceph: use calc_pages_for() in start_read() Alex Elder
2013-03-04 18:15 ` [PATCH 2/3] ceph: simplify ceph_sync_write() page_align calculation Alex Elder
2013-03-04 18:15 ` [PATCH 3/3] libceph: don't assign page info in ceph_osdc_new_request() Alex Elder
2013-03-05 1:55 ` [PATCH 0/3] ceph: assign message data fields consistently Josh Durgin
2013-03-04 18:16 ` [PATCH 0/3] libceph: distinguish osd request read and write data Alex Elder
2013-03-04 18:17 ` [PATCH 1/3] libceph: separate osd request data info Alex Elder
2013-03-05 2:13 ` Josh Durgin
2013-03-04 18:18 ` [PATCH 2/3] libceph: distinguish page and bio requests Alex Elder
2013-03-05 2:14 ` Josh Durgin
2013-03-04 18:18 ` [PATCH 3/3] libceph: separate read and write data Alex Elder
2013-03-05 2:15 ` Josh Durgin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5134E358.50309@inktank.com \
--to=elder@inktank.com \
--cc=ceph-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.