diff options
| author | Alex Elder | 2013-02-26 00:35:46 +0100 |
|---|---|---|
| committer | Sage Weil | 2013-05-02 06:14:28 +0200 |
| commit | d4b515fa10dd52a2aef88df7299e9f3a8ab0957a (patch) | |
| tree | 0110566b4e00aeb5215b1b967ff64695cd45eb10 /net/ceph/osd_client.c | |
| parent | libceph: don't pass request to calc_layout() (diff) | |
| download | kernel-qcow2-linux-d4b515fa10dd52a2aef88df7299e9f3a8ab0957a.tar.gz kernel-qcow2-linux-d4b515fa10dd52a2aef88df7299e9f3a8ab0957a.tar.xz kernel-qcow2-linux-d4b515fa10dd52a2aef88df7299e9f3a8ab0957a.zip | |
libceph: distinguish page array and pagelist count
Use distinct fields for tracking the number of pages in a message's
page array and in a message's page list. Currently only one or the
other is used at a time, but that will be changing soon.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'net/ceph/osd_client.c')
| -rw-r--r-- | net/ceph/osd_client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 29e4fe09e31a..c3d8c6904df3 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1742,7 +1742,7 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc, int rc = 0; req->r_request->pages = req->r_pages; - req->r_request->nr_pages = req->r_num_pages; + req->r_request->page_count = req->r_num_pages; #ifdef CONFIG_BLOCK req->r_request->bio = req->r_bio; #endif @@ -2093,7 +2093,7 @@ static struct ceph_msg *get_reply(struct ceph_connection *con, goto out; } m->pages = req->r_pages; - m->nr_pages = req->r_num_pages; + m->page_count = req->r_num_pages; m->page_alignment = req->r_page_alignment; #ifdef CONFIG_BLOCK m->bio = req->r_bio; |