aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-07-19 09:49:18 -0400
committerSage Weil <sage@inktank.com>2012-07-30 21:15:44 -0400
commit9e15dc735a7a0418be14e2deab44ddee369af857 (patch)
tree3c6a2be1f96dcaf16b5416d189fd1e1edb169741 /drivers/block
parent505cbb9bedc8c609c31d86ff4f8f656e5a0f9c49 (diff)
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/block')
-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 c299a55e3ff1..6df8c62c40f5 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -82,7 +82,6 @@ struct rbd_image_header {
82 __u8 comp_type; 82 __u8 comp_type;
83 struct ceph_snap_context *snapc; 83 struct ceph_snap_context *snapc;
84 size_t snap_names_len; 84 size_t snap_names_len;
85 u64 snap_seq;
86 u32 total_snaps; 85 u32 total_snaps;
87 86
88 char *snap_names; 87 char *snap_names;
@@ -536,7 +535,6 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
536 header->comp_type = ondisk->options.comp_type; 535 header->comp_type = ondisk->options.comp_type;
537 536
538 atomic_set(&header->snapc->nref, 1); 537 atomic_set(&header->snapc->nref, 1);
539 header->snap_seq = le64_to_cpu(ondisk->snap_seq);
540 header->snapc->seq = le64_to_cpu(ondisk->snap_seq); 538 header->snapc->seq = le64_to_cpu(ondisk->snap_seq);
541 header->snapc->num_snaps = snap_count; 539 header->snapc->num_snaps = snap_count;
542 header->total_snaps = snap_count; 540 header->total_snaps = snap_count;