Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 373521
b: refs/heads/master
c: b644de2
h: refs/heads/master
i:
  373519: bdf2b26
v: v3
  • Loading branch information
Alex Elder authored and Sage Weil committed May 2, 2013
1 parent 7b564ae commit faf13b1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 96f03e08f9f27cf72d2c24b4e75ade81d2df3c75
refs/heads/master: b644de2ba0c5b590db9195c03358ccd0f061daa6
21 changes: 11 additions & 10 deletions trunk/drivers/block/rbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -4721,11 +4721,6 @@ static int rbd_dev_probe_parent(struct rbd_device *rbd_dev)
static int rbd_dev_probe_finish(struct rbd_device *rbd_dev)
{
int ret;
int tmp;

ret = rbd_dev_header_watch_sync(rbd_dev, 1);
if (ret)
return ret;

ret = rbd_dev_mapping_set(rbd_dev);
if (ret)
Expand Down Expand Up @@ -4773,9 +4768,6 @@ static int rbd_dev_probe_finish(struct rbd_device *rbd_dev)
unregister_blkdev(rbd_dev->major, rbd_dev->name);
err_out_id:
rbd_dev_id_put(rbd_dev);
tmp = rbd_dev_header_watch_sync(rbd_dev, 0);
if (tmp)
rbd_warn(rbd_dev, "failed to cancel watch event (%d)\n", ret);
rbd_dev_mapping_clear(rbd_dev);

return ret;
Expand Down Expand Up @@ -4816,6 +4808,7 @@ static int rbd_dev_header_name(struct rbd_device *rbd_dev)
static int rbd_dev_image_probe(struct rbd_device *rbd_dev)
{
int ret;
int tmp;

/*
* Get the id from the image id object. If it's not a
Expand All @@ -4832,16 +4825,20 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev)
if (ret)
goto err_out_format;

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)
goto out_header_name;
goto err_out_watch;

ret = rbd_dev_spec_update(rbd_dev);
if (ret)
Expand All @@ -4861,6 +4858,10 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev)
rbd_header_free(&rbd_dev->header);
err_out_snaps:
rbd_remove_all_snaps(rbd_dev);
err_out_watch:
tmp = rbd_dev_header_watch_sync(rbd_dev, 0);
if (tmp)
rbd_warn(rbd_dev, "unable to tear down watch request\n");
out_header_name:
kfree(rbd_dev->header_name);
rbd_dev->header_name = NULL;
Expand Down

0 comments on commit faf13b1

Please sign in to comment.