summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-07-19 08:49:18 -0500
committerSage Weil <sage@inktank.com>2012-07-30 18:15:44 -0700
commit9e15dc735a7a0418be14e2deab44ddee369af857 (patch)
tree3c6a2be1f96dcaf16b5416d189fd1e1edb169741 /drivers
parent505cbb9bedc8c609c31d86ff4f8f656e5a0f9c49 (diff)
downloadlinux-3.10-9e15dc735a7a0418be14e2deab44ddee369af857.tar.gz
linux-3.10-9e15dc735a7a0418be14e2deab44ddee369af857.tar.bz2
linux-3.10-9e15dc735a7a0418be14e2deab44ddee369af857.zip
rbd: kill rbd_image_header->snap_seq
The snap_seq field in an rbd_image_header structure held the value from the rbd image header when it was last refreshed. We now maintain this value in the snapc->seq field. So get rid of the other one. 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.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index c299a55e3ff..6df8c62c40f 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -82,7 +82,6 @@ struct rbd_image_header {
__u8 comp_type;
struct ceph_snap_context *snapc;
size_t snap_names_len;
- u64 snap_seq;
u32 total_snaps;
char *snap_names;
@@ -536,7 +535,6 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
header->comp_type = ondisk->options.comp_type;
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;