From e38a881f64ea8dedd5891e32c688bfef03d74ec7 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Thu, 19 Jul 2012 08:49:18 -0500 Subject: [PATCH] --- yaml --- r: 320347 b: refs/heads/master c: 9e15dc735a7a0418be14e2deab44ddee369af857 h: refs/heads/master i: 320345: 0dafec593889da343dae84464e5a357aee9846fa 320343: f3d28fe4aad61cdf27913593d3760e6f50b2e468 v: v3 --- [refs] | 2 +- trunk/drivers/block/rbd.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8dacd93fb1e5..bc25b9e5fbd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 505cbb9bedc8c609c31d86ff4f8f656e5a0f9c49 +refs/heads/master: 9e15dc735a7a0418be14e2deab44ddee369af857 diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c index c299a55e3ff1..6df8c62c40f5 100644 --- a/trunk/drivers/block/rbd.c +++ b/trunk/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;