summaryrefslogtreecommitdiffstats
path: root/drivers/block/rbd.c
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-07-19 15:49:18 +0200
committerSage Weil <sage@inktank.com>2012-07-31 03:15:43 +0200
commit505cbb9bedc8c609c31d86ff4f8f656e5a0f9c49 (patch)
tree460fca717d94ec4b897078e8201dca35b3fdcdcc /drivers/block/rbd.c
parentrbd: preserve snapc->seq in rbd_header_set_snap() (diff)
downloadlinux-505cbb9bedc8c609c31d86ff4f8f656e5a0f9c49.tar.xz
linux-505cbb9bedc8c609c31d86ff4f8f656e5a0f9c49.zip
rbd: set snapc->seq only when refreshing header
In rbd_header_add_snap() there is code to set snapc->seq to the just-added snapshot id. This is the only remnant left of the use of that field for recording which snapshot an rbd_dev was associated with. That functionality is no longer supported, so get rid of that final bit of code. Doing so means we never actually set snapc->seq any more. On the server, the snapshot context's sequence value represents the highest snapshot id ever issued for a particular rbd image. So we'll make it have that meaning here as well. To do so, set this value whenever the rbd header is (re-)read. That way it will always be consistent with the rest of the snapshot context we maintain. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to '')
-rw-r--r--drivers/block/rbd.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index ac8a83fc2ad9..c299a55e3ff1 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -537,6 +537,7 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
atomic_set(&header->snapc->nref, 1);
header->snap_seq = le64_to_cpu(ondisk->snap_seq);
+ header->snapc->seq = le64_to_cpu(ondisk->snap_seq);
header->snapc->num_snaps = snap_count;
header->total_snaps = snap_count;
@@ -1685,14 +1686,7 @@ static int rbd_header_add_snap(struct rbd_device *rbd_dev,
kfree(data);
- if (ret < 0)
- return ret;
-
- down_write(&rbd_dev->header_rwsem);
- rbd_dev->header.snapc->seq = new_snapid;
- up_write(&rbd_dev->header_rwsem);
-
- return 0;
+ return ret < 0 ? ret : 0;
bad:
return -ERANGE;
}