---

yaml
---
r: 331631
b: refs/heads/master
c: 28cb775
h: refs/heads/master
i:
  331629: b0b28d2
  331627: f2add33
  331623: fc94344
  331615: 96a7865
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a52325f61760c6a7d7f3ea9736029bc9f63e7f3
+refs/heads/master: 28cb775de1bd1bcc62c43f767ab81b7b9cfb6678

trunk/drivers/block/rbd.c

@@ -540,7 +540,14 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
 	header->comp_type = ondisk->options.comp_type;
 	header->total_snaps = snap_count;
 
-	/* Set up the snapshot context */
+	/*
+	 * If the number of snapshot ids provided by the caller
+	 * doesn't match the number in the entire context there's
+	 * no point in going further.  Caller will try again after
+	 * getting an updated snapshot context from the server.
+	 */
+	if (allocated_snaps != snap_count)
+		return 0;
 
 	size = sizeof (struct ceph_snap_context);
 	size += snap_count * sizeof (header->snapc->snaps[0]);
@@ -552,8 +559,10 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
 	header->snapc->seq = le64_to_cpu(ondisk->snap_seq);
 	header->snapc->num_snaps = snap_count;
 
-	if (snap_count && allocated_snaps == snap_count) {
-		int i;
+	/* Fill in the snapshot information */
+
+	if (snap_count) {
+		u32 i;
 
 		for (i = 0; i < snap_count; i++) {
 			header->snapc->snaps[i] =