Commit 39bf2c5d authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

rbd: move rbd_osd_trivial_callback() 



This function is slightly out of place, probably the result
of an errant automatic merge or something.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent 49659416

drivers/block/rbd.c

+7 −7
Original line number Diff line number Diff line
@@ -1264,13 +1264,6 @@ static bool obj_request_done_test(struct rbd_obj_request *obj_request) 
	return atomic_read(&obj_request->done) != 0;

}



static void rbd_osd_trivial_callback(struct rbd_obj_request *obj_request,

				struct ceph_osd_op *op)

{

	dout("%s: obj %p\n", __func__, obj_request);

	obj_request_done_set(obj_request);

}



static void rbd_obj_request_complete(struct rbd_obj_request *obj_request)

{

	dout("%s: obj %p cb %p\n", __func__, obj_request,
@@ -1281,6 +1274,13 @@ static void rbd_obj_request_complete(struct rbd_obj_request *obj_request) 
		complete_all(&obj_request->completion);

}



static void rbd_osd_trivial_callback(struct rbd_obj_request *obj_request,

				struct ceph_osd_op *op)

{

	dout("%s: obj %p\n", __func__, obj_request);

	obj_request_done_set(obj_request);

}



static void rbd_osd_read_callback(struct rbd_obj_request *obj_request,

				struct ceph_osd_op *op)

{