diff options
| author | Alex Elder | 2013-01-20 21:44:42 +0100 |
|---|---|---|
| committer | Sage Weil | 2013-02-14 03:29:09 +0100 |
| commit | 5ae9db81b45c2d95554c665043afffd5e9a7d5ac (patch) | |
| tree | 712ac569bf38f4f60efde64795a9b6e0e8c1bb63 /drivers/block/rbd.c | |
| parent | rbd: use new code for notify ack (diff) | |
| download | kernel-qcow2-linux-5ae9db81b45c2d95554c665043afffd5e9a7d5ac.tar.gz kernel-qcow2-linux-5ae9db81b45c2d95554c665043afffd5e9a7d5ac.tar.xz kernel-qcow2-linux-5ae9db81b45c2d95554c665043afffd5e9a7d5ac.zip | |
rbd: get rid of rbd_req_sync_notify_ack()
Get rid rbd_req_sync_notify_ack() because it is no longer used.
As a result rbd_simple_req_cb() becomes unreferenced, so get rid
of that too.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'drivers/block/rbd.c')
| -rw-r--r-- | drivers/block/rbd.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 1428795571c9..7a6694d08874 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1242,12 +1242,6 @@ done_err: return ret; } -static void rbd_simple_req_cb(struct ceph_osd_request *osd_req, - struct ceph_msg *msg) -{ - ceph_osdc_put_request(osd_req); -} - /* * Do a synchronous ceph osd operation */ @@ -1324,32 +1318,6 @@ static void rbd_obj_request_complete(struct rbd_obj_request *obj_request) } /* - * Request sync osd watch - */ -static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev, - u64 ver, - u64 notify_id) -{ - struct ceph_osd_req_op *op; - int ret; - - op = rbd_osd_req_op_create(CEPH_OSD_OP_NOTIFY_ACK, notify_id, ver); - if (!op) - return -ENOMEM; - - ret = rbd_do_request(NULL, rbd_dev, NULL, CEPH_NOSNAP, - rbd_dev->header_name, 0, 0, NULL, - NULL, 0, - CEPH_OSD_FLAG_READ, - op, - rbd_simple_req_cb, NULL); - - rbd_osd_req_op_destroy(op); - - return ret; -} - -/* * Synchronous osd object method call */ static int rbd_req_sync_exec(struct rbd_device *rbd_dev, @@ -1867,7 +1835,6 @@ static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data) rbd_warn(rbd_dev, "got notification but failed to " " update snaps: %d\n", rc); - (void) rbd_req_sync_notify_ack; /* avoid a warning */ rbd_obj_notify_ack_sync(rbd_dev, hver, notify_id); } |