android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rbd: set snapshot id in rbd_dev_probe_update_spec()

Browse Source 
Set the rbd spec's snapshot id for an image getting mapped in
rbd_dev_probe_update_spec() rather than rbd_dev_set_mapping().
This is the more logical place for that to happen (even though
it means we might look up the snapshot by name twice).

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2013-04-25 23:15:08 -05:00 committed by Sage Weil
parent 8b0241f85a
commit e1d4213f09
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/block/rbd.c
View File

@ -846,7 +846,6 @@ static int rbd_dev_set_mapping(struct rbd_device *rbd_dev)
{ {
if (!memcmp(rbd_dev->spec->snap_name, RBD_SNAP_HEAD_NAME, if (!memcmp(rbd_dev->spec->snap_name, RBD_SNAP_HEAD_NAME,
sizeof (RBD_SNAP_HEAD_NAME))) { sizeof (RBD_SNAP_HEAD_NAME))) {
rbd_dev->spec->snap_id = CEPH_NOSNAP;
rbd_dev->mapping.size = rbd_dev->header.image_size; rbd_dev->mapping.size = rbd_dev->header.image_size;
rbd_dev->mapping.features = rbd_dev->header.features; rbd_dev->mapping.features = rbd_dev->header.features;
} else { } else {
@ -855,7 +854,6 @@ static int rbd_dev_set_mapping(struct rbd_device *rbd_dev)
snap = snap_by_name(rbd_dev, rbd_dev->spec->snap_name); snap = snap_by_name(rbd_dev, rbd_dev->spec->snap_name);
if (!snap) if (!snap)
return -ENOENT; return -ENOENT;
rbd_dev->spec->snap_id = snap->id;
rbd_dev->mapping.size = snap->size; rbd_dev->mapping.size = snap->size;
rbd_dev->mapping.features = snap->features; rbd_dev->mapping.features = snap->features;
rbd_dev->mapping.read_only = true; rbd_dev->mapping.read_only = true;
@ -3760,6 +3758,10 @@ static char *rbd_dev_image_name(struct rbd_device *rbd_dev)
* rbd_dev_snaps_update() has completed because some of the * rbd_dev_snaps_update() has completed because some of the
* information (in particular, snapshot name) is not available * information (in particular, snapshot name) is not available
* until then. * until then.
*
* When an image being mapped (not a parent) is probed, we have the
* pool name and pool id, image name and image id, and the snapshot
* name. The only thing we're missing is the snapshot id.
*/ */
static int rbd_dev_probe_update_spec(struct rbd_device *rbd_dev) static int rbd_dev_probe_update_spec(struct rbd_device *rbd_dev)
{ {
@ -3768,8 +3770,24 @@ static int rbd_dev_probe_update_spec(struct rbd_device *rbd_dev)
void *reply_buf = NULL; void *reply_buf = NULL;
int ret; int ret;
if (rbd_dev->spec->pool_name) /*
return 0; /* Already have the names */ * An image being mapped will have the pool name (etc.), but
* we need to look up the snapshot id.
*/
if (rbd_dev->spec->pool_name) {
if (strcmp(rbd_dev->spec->snap_name, RBD_SNAP_HEAD_NAME)) {
struct rbd_snap *snap;
snap = snap_by_name(rbd_dev, rbd_dev->spec->snap_name);
if (!snap)
return -ENOENT;
rbd_dev->spec->snap_id = snap->id;
} else {
rbd_dev->spec->snap_id = CEPH_NOSNAP;
}
return 0;
}
/* Look up the pool name */ /* Look up the pool name */