From ddfd39555730d40ce976407951f37f03687b4ecf Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Wed, 29 Aug 2012 17:11:07 -0500 Subject: [PATCH] --- yaml --- r: 331668 b: refs/heads/master c: 5ed1617731a1e9201c3541a9c05ce3ec73975589 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/rbd.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 072ac1c8bc9b..bb1e7f2b1714 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 304f68086f8206da7c5930a9cb0207c91d1983a6 +refs/heads/master: 5ed1617731a1e9201c3541a9c05ce3ec73975589 diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c index 0d812603e6d5..a9f5de2706ec 100644 --- a/trunk/drivers/block/rbd.c +++ b/trunk/drivers/block/rbd.c @@ -640,7 +640,7 @@ static int snap_by_name(struct rbd_device *rbd_dev, const char *snap_name) return -ENOENT; } -static int rbd_header_set_snap(struct rbd_device *rbd_dev, char *snap_name) +static int rbd_dev_set_mapping(struct rbd_device *rbd_dev, char *snap_name) { int ret; @@ -2625,12 +2625,13 @@ static ssize_t rbd_add(struct bus_type *bus, rc = rbd_dev_snaps_update(rbd_dev); if (rc) goto err_out_bus; - rc = rbd_dev_snaps_register(rbd_dev); + + rc = rbd_dev_set_mapping(rbd_dev, snap_name); if (rc) goto err_out_bus; down_write(&rbd_dev->header_rwsem); - rc = rbd_header_set_snap(rbd_dev, snap_name); + rc = rbd_dev_snaps_register(rbd_dev); up_write(&rbd_dev->header_rwsem); if (rc) goto err_out_bus;