Add additional debugging statements to analyse the state machine.
Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
---
drivers/block/rbd.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 8cfd9407cbb8..b708f5ecda07 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -291,6 +291,7 @@ struct rbd_obj_request {
union {
enum rbd_obj_read_state read_state; /* for reads */
enum rbd_obj_write_state write_state; /* for writes */
+ unsigned char obj_state; /* generic access */
};
struct rbd_img_request *img_request;
@@ -1352,8 +1353,12 @@ static inline void rbd_img_obj_request_add(struct rbd_img_request *img_request,
static inline void rbd_img_obj_request_del(struct rbd_img_request *img_request,
struct rbd_obj_request *obj_request)
{
- dout("%s: img %p obj %p\n", __func__, img_request, obj_request);
- list_del(&obj_request->ex.oe_item);
+ dout("%s: img %p obj %p state %d copyup %d pending %d\n", __func__,
+ img_request, obj_request, obj_request->obj_state,
+ obj_request->copyup_state, obj_request->pending.num_pending);
+ WARN_ON(obj_request->obj_state > 1);
+ WARN_ON(obj_request->pending.num_pending);
+ list_del_init(&obj_request->ex.oe_item);
rbd_assert(obj_request->img_request == img_request);
rbd_obj_request_put(obj_request);
}
@@ -1497,6 +1502,8 @@ __rbd_obj_add_osd_request(struct rbd_obj_request *obj_req,
req->r_callback = rbd_osd_req_callback;
req->r_priv = obj_req;
+ dout("%s: osd_req %p for obj_req %p\n", __func__, req, obj_req);
+
/*
* Data objects may be stored in a separate pool, but always in
* the same namespace in that pool as the header in its pool.
@@ -1686,6 +1693,7 @@ static void rbd_img_request_destroy(struct kref *kref)
dout("%s: img %p\n", __func__, img_request);
WARN_ON(!list_empty(&img_request->lock_item));
+ WARN_ON(img_request->state != RBD_IMG_DONE);
mutex_lock(&img_request->object_mutex);
for_each_obj_request_safe(img_request, obj_request, next_obj_request)
rbd_img_obj_request_del(img_request, obj_request);
@@ -3513,6 +3521,8 @@ static void rbd_obj_handle_request(struct rbd_obj_request *obj_req, int result)
{
if (__rbd_obj_handle_request(obj_req, &result)) {
/* Recurse into parent */
+ dout("%s: obj %p parent %p result %d\n", __func__,
+ obj_req, obj_req->img_request, result);
rbd_img_handle_request(obj_req->img_request, result);
}
}
@@ -3603,6 +3613,9 @@ static void rbd_img_object_requests(struct rbd_img_request *img_req)
int result = 0;
if (__rbd_obj_handle_request(obj_req, &result)) {
+ dout("%s: obj %p parent %p img %p result %d\n",
+ __func__, obj_req, obj_req->img_request,
+ img_req, result);
if (result) {
img_req->pending.result = result;
mutex_unlock(&img_req->object_mutex);
--
2.16.4
