Convert linger->notify_id_pages to a ceph_databuf
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
---
include/linux/ceph/osd_client.h | 2 +-
net/ceph/osd_client.c | 18 +++++++-----------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 0b02e272acc2..780bd49d2734 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -348,7 +348,7 @@ struct ceph_osd_linger_request {
void *data;
struct ceph_pagelist *request_pl;
- struct page **notify_id_pages;
+ struct ceph_databuf *notify_id_buf;
struct page ***preply_pages;
size_t *preply_len;
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index aa9d07221149..02c35785ec28 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -2825,11 +2825,8 @@ static void linger_release(struct kref *kref)
WARN_ON(!list_empty(&lreq->pending_lworks));
WARN_ON(lreq->osd);
- if (lreq->request_pl)
- ceph_pagelist_release(lreq->request_pl);
- if (lreq->notify_id_pages)
- ceph_release_page_vector(lreq->notify_id_pages, 1);
-
+ ceph_pagelist_release(lreq->request_pl);
+ ceph_databuf_release(lreq->notify_id_buf);
ceph_osdc_put_request(lreq->reg_req);
ceph_osdc_put_request(lreq->ping_req);
target_destroy(&lreq->t);
@@ -3210,9 +3207,9 @@ static void send_linger(struct ceph_osd_linger_request *lreq)
refcount_inc(&lreq->request_pl->refcnt);
osd_req_op_notify_init(req, 0, lreq->linger_id,
lreq->request_pl);
- ceph_osd_data_pages_init(
+ ceph_osd_databuf_init(
osd_req_op_data(req, 0, notify, response_data),
- lreq->notify_id_pages, PAGE_SIZE, 0, false, false);
+ lreq->notify_id_buf);
}
dout("lreq %p register\n", lreq);
req->r_callback = linger_commit_cb;
@@ -4995,10 +4992,9 @@ int ceph_osdc_notify(struct ceph_osd_client *osdc,
}
/* for notify_id */
- lreq->notify_id_pages = ceph_alloc_page_vector(1, GFP_NOIO);
- if (IS_ERR(lreq->notify_id_pages)) {
- ret = PTR_ERR(lreq->notify_id_pages);
- lreq->notify_id_pages = NULL;
+ lreq->notify_id_buf = ceph_databuf_alloc(1, PAGE_SIZE, GFP_NOIO);
+ if (!lreq->notify_id_buf) {
+ ret = -ENOMEM;
goto out_put_lreq;
}
