summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-02-26 14:23:07 -0600
committerSage Weil <sage@inktank.com>2013-02-26 14:59:49 -0800
commit39bf2c5d096729939cab657fe641044eceaa84a2 (patch)
treebb7b926d595af9720017ae3d6f7734d4b59d7284
parent49659416ba4fa8308bd29e453f54c3bcf8a0fbf1 (diff)
downloadop-kernel-dev-39bf2c5d096729939cab657fe641044eceaa84a2.zip
op-kernel-dev-39bf2c5d096729939cab657fe641044eceaa84a2.tar.gz
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: Alex Elder <elder@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
-rw-r--r--drivers/block/rbd.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index c6b15d4..4f5a647 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -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)
{
OpenPOWER on IntegriCloud