Commit 9e15dc73 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil

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: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 505cbb9b
...@@ -82,7 +82,6 @@ struct rbd_image_header { ...@@ -82,7 +82,6 @@ struct rbd_image_header {
__u8 comp_type; __u8 comp_type;
struct ceph_snap_context *snapc; struct ceph_snap_context *snapc;
size_t snap_names_len; size_t snap_names_len;
u64 snap_seq;
u32 total_snaps; u32 total_snaps;
char *snap_names; char *snap_names;
...@@ -536,7 +535,6 @@ static int rbd_header_from_disk(struct rbd_image_header *header, ...@@ -536,7 +535,6 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
header->comp_type = ondisk->options.comp_type; header->comp_type = ondisk->options.comp_type;
atomic_set(&header->snapc->nref, 1); 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->seq = le64_to_cpu(ondisk->snap_seq);
header->snapc->num_snaps = snap_count; header->snapc->num_snaps = snap_count;
header->total_snaps = snap_count; header->total_snaps = snap_count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment