Commit 86ea43bf authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

rbd: get rid of rbd_req_sync_read() 



Delete rbd_req_sync_read() is no longer used, so get rid of it.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 788e2df3

drivers/block/rbd.c

+0 −24
Original line number Diff line number Diff line
@@ -1314,29 +1314,6 @@ static void rbd_obj_request_complete(struct rbd_obj_request *obj_request) 
		complete_all(&obj_request->completion);

}



/*

 * Synchronously read a range from an object into a provided buffer

 */

static int rbd_req_sync_read(struct rbd_device *rbd_dev,

			  const char *object_name,

			  u64 ofs, u64 len,

			  char *buf,

			  u64 *ver)

{

	struct ceph_osd_req_op *op;

	int ret;



	op = rbd_osd_req_op_create(CEPH_OSD_OP_READ, ofs, len);

	if (!op)

		return -ENOMEM;



	ret = rbd_req_sync_op(rbd_dev, CEPH_OSD_FLAG_READ,

			       op, object_name, ofs, len, buf, ver);

	rbd_osd_req_op_destroy(op);



	return ret;

}



/*

 * Request sync osd watch

 */
@@ -2112,7 +2089,6 @@ rbd_dev_v1_header_read(struct rbd_device *rbd_dev, u64 *version) 
		if (!ondisk)

			return ERR_PTR(-ENOMEM);



		(void) rbd_req_sync_read;	/* avoid a warning */

		ret = rbd_obj_read_sync(rbd_dev, rbd_dev->header_name,

				       0, size,

				       (char *) ondisk, version);