Skip to content

Commit

Permalink
rbd: send notify ack asynchronously
Browse files Browse the repository at this point in the history
When we receive notification of a change to an rbd image's header
object we need to refresh our information about the image (its
size and snapshot context).  Once we have refreshed our rbd image
we need to acknowledge the notification.

This acknowledgement was previously done synchronously, but there's
really no need to wait for it to complete.

Change it so the caller doesn't wait for the notify acknowledgement
request to complete.  And change the name to reflect it's no longer
synchronous.

This resolves:
    http://tracker.newdream.net/issues/3877

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 5ae9db8 commit cf81b60
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/block/rbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1785,7 +1785,7 @@ static int rbd_img_request_submit(struct rbd_img_request *img_request)
return 0;
}

static int rbd_obj_notify_ack_sync(struct rbd_device *rbd_dev,
static int rbd_obj_notify_ack(struct rbd_device *rbd_dev,
u64 ver, u64 notify_id)
{
struct rbd_obj_request *obj_request;
Expand All @@ -1809,11 +1809,11 @@ static int rbd_obj_notify_ack_sync(struct rbd_device *rbd_dev,
goto out;

osdc = &rbd_dev->rbd_client->client->osdc;
obj_request->callback = rbd_obj_request_put;
ret = rbd_obj_request_submit(osdc, obj_request);
if (!ret)
ret = rbd_obj_request_wait(obj_request);
out:
rbd_obj_request_put(obj_request);
if (ret)
rbd_obj_request_put(obj_request);

return ret;
}
Expand All @@ -1835,7 +1835,7 @@ 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);

rbd_obj_notify_ack_sync(rbd_dev, hver, notify_id);
rbd_obj_notify_ack(rbd_dev, hver, notify_id);
}

/*
Expand Down

0 comments on commit cf81b60

Please sign in to comment.