Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 331665
b: refs/heads/master
c: e86924a
h: refs/heads/master
i:
  331663: e7d3c35
v: v3
  • Loading branch information
Alex Elder committed Oct 1, 2012
1 parent 3e61da2 commit afadcff
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 15 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: cd789ab9cacbda1aad43304b89cff29004b793ea
refs/heads/master: e86924a8092fda66b859f12a4d7d37a4a458d74a
22 changes: 8 additions & 14 deletions trunk/drivers/block/rbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -623,23 +623,18 @@ static int rbd_header_from_disk(struct rbd_image_header *header,

static int snap_by_name(struct rbd_device *rbd_dev, const char *snap_name)
{
int i;
struct rbd_image_header *header = &rbd_dev->header;
char *p = header->snap_names;

rbd_assert(header->snapc != NULL);
for (i = 0; i < header->snapc->num_snaps; i++) {
if (!strcmp(snap_name, p)) {

/* Found it. Pass back its id and/or size */
struct rbd_snap *snap;

rbd_dev->mapping.snap_id = header->snapc->snaps[i];
rbd_dev->mapping.size = header->snap_sizes[i];
list_for_each_entry(snap, &rbd_dev->snaps, node) {
if (!strcmp(snap_name, snap->name)) {
rbd_dev->mapping.snap_id = snap->id;
rbd_dev->mapping.size = snap->size;

return i;
return 0;
}
p += strlen(p) + 1; /* Skip ahead to the next name */
}

return -ENOENT;
}

Expand All @@ -653,6 +648,7 @@ static int rbd_header_set_snap(struct rbd_device *rbd_dev, char *snap_name)
rbd_dev->mapping.size = rbd_dev->header.image_size;
rbd_dev->mapping.snap_exists = false;
rbd_dev->mapping.read_only = rbd_dev->rbd_opts.read_only;
ret = 0;
} else {
ret = snap_by_name(rbd_dev, snap_name);
if (ret < 0)
Expand All @@ -661,8 +657,6 @@ static int rbd_header_set_snap(struct rbd_device *rbd_dev, char *snap_name)
rbd_dev->mapping.read_only = true;
}
rbd_dev->mapping.snap_name = snap_name;

ret = 0;
done:
return ret;
}
Expand Down

0 comments on commit afadcff

Please sign in to comment.