| Message ID | 517C299A.6030109@inktank.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 1832b6a..5fcf23f 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -4705,10 +4705,6 @@ static int rbd_dev_probe_finish(struct rbd_device *rbd_dev) { int ret; - ret = rbd_dev_header_watch_sync(rbd_dev, 1); - if (ret) - return ret; - /* generate unique id: find highest unique id, add one */ rbd_dev_id_get(rbd_dev);
Move setting up the watch request for an image so it's done in rbd_dev_probe_image() rather than rbd_dev_probe_finish(). Move it all the way up to before doing the initial probe. This avoids a potential race condition, in which we get (and use) the initial snapshot context for an image, and it gets changed between that time and the time we get the watch set up. This resolves: http://tracker.ceph.com/issues/3871 Signed-off-by: Alex Elder <elder@inktank.com> --- drivers/block/rbd.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) @@ -4767,7 +4763,6 @@ err_out_id: rbd_dev_id_put(rbd_dev); if (rbd_dev->parent); rbd_dev_remove_parent(rbd_dev); - (void)rbd_dev_header_watch_sync(rbd_dev, 0); return ret; } @@ -4824,12 +4819,16 @@ static int rbd_dev_probe_image(struct rbd_device *rbd_dev) if (ret) goto out_err; + ret = rbd_dev_header_watch_sync(rbd_dev, 1); + if (ret) + goto out_header_name; + if (rbd_dev->image_format == 1) ret = rbd_dev_v1_probe(rbd_dev); else ret = rbd_dev_v2_probe(rbd_dev); if (ret) - goto out_header_name; + goto err_out_watch; ret = rbd_dev_snaps_update(rbd_dev); if (ret) @@ -4841,7 +4840,7 @@ static int rbd_dev_probe_image(struct rbd_device *rbd_dev) ret = rbd_dev_probe_parent(rbd_dev); if (ret) - goto err_out_snaps; + goto err_out_watch; ret = rbd_dev_probe_finish(rbd_dev); if (ret) @@ -4857,6 +4856,8 @@ err_out_snaps: out_header_name: kfree(rbd_dev->header_name); rbd_dev->header_name = NULL; +err_out_watch: + (void)rbd_dev_header_watch_sync(rbd_dev, 0); out_err: kfree(rbd_dev->spec->image_id); rbd_dev->spec->image_id = NULL;