diff options
| author | Alex Elder <elder@inktank.com> | 2012-07-10 20:30:11 -0500 |
|---|---|---|
| committer | Alex Elder <elder@inktank.com> | 2012-10-01 14:30:53 -0500 |
| commit | c8d184250d8a47b1a958affcffe3ffdd85644301 (patch) | |
| tree | 9ee8e260c00a8e798d6daef6d00001dd0793a0bb /drivers | |
| parent | 02cdb02ceab1f3dd9ac2bc899fc51f0e0e744782 (diff) | |
| download | linux-c8d184250d8a47b1a958affcffe3ffdd85644301.tar.bz2 | |
rbd: don't use index in __rbd_add_snap_dev()
Pass the snapshot id and snapshot size rather than an index
to __rbd_add_snap_dev() to specify values for a new snapshot.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/rbd.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index e453f8cc8949..8ac193ff4849 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2036,7 +2036,8 @@ static int rbd_register_snap_dev(struct rbd_snap *snap, } static struct rbd_snap *__rbd_add_snap_dev(struct rbd_device *rbd_dev, - int i, const char *name) + const char *snap_name, + u64 snap_id, u64 snap_size) { struct rbd_snap *snap; int ret; @@ -2046,12 +2047,12 @@ static struct rbd_snap *__rbd_add_snap_dev(struct rbd_device *rbd_dev, return ERR_PTR(-ENOMEM); ret = -ENOMEM; - snap->name = kstrdup(name, GFP_KERNEL); + snap->name = kstrdup(snap_name, GFP_KERNEL); if (!snap->name) goto err; - snap->size = rbd_dev->header.snap_sizes[i]; - snap->id = rbd_dev->header.snapc->snaps[i]; + snap->id = snap_id; + snap->size = snap_size; return snap; @@ -2116,12 +2117,13 @@ static int rbd_dev_snaps_update(struct rbd_device *rbd_dev) dout("entry %u: snap_id = %llu\n", (unsigned int) snap_count, (unsigned long long) snap_id); if (!snap || (snap_id != CEPH_NOSNAP && snap->id < snap_id)) { + struct rbd_image_header *header = &rbd_dev->header; struct rbd_snap *new_snap; /* We haven't seen this snapshot before */ - new_snap = __rbd_add_snap_dev(rbd_dev, index, - snap_name); + new_snap = __rbd_add_snap_dev(rbd_dev, snap_name, + snap_id, header->snap_sizes[index]); if (IS_ERR(new_snap)) { int err = PTR_ERR(new_snap); |