Skip to content

Commit

Permalink
rbd: get rid of rbd_req_sync_notify_ack()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alex Elder authored and Sage Weil committed Feb 14, 2013
1 parent b8d7003 commit 5ae9db8
Showing 1 changed file with 0 additions and 33 deletions.
33 changes: 0 additions & 33 deletions drivers/block/rbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1242,12 +1242,6 @@ static int rbd_do_request(struct request *rq,
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
*/
Expand Down Expand Up @@ -1323,32 +1317,6 @@ static void rbd_obj_request_complete(struct rbd_obj_request *obj_request)
complete_all(&obj_request->completion);
}

/*
* 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
*/
Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit 5ae9db8

Please sign in to comment.