From 08a8c20cf936204d98dfa2b7c3552b1560331647 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Thu, 25 Apr 2013 15:09:41 -0500
Subject: [PATCH] --- yaml --- r: 373489 b: refs/heads/master c:
 c86f86e9e75e77e4d51ded9edbad30834ff606f7 h: refs/heads/master i:   373487:
 f1c20e4a1af8df5415d225d120d35eac46ac8c8a v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/block/rbd.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bc40759b0977..c35469d015c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 522a0cc0f0ecdb1857db7795b1c17591f28f9ca0
+refs/heads/master: c86f86e9e75e77e4d51ded9edbad30834ff606f7
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index 28b652c38102..1e01f0d8312a 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -3494,7 +3494,8 @@ static int _rbd_dev_v2_snap_size(struct rbd_device *rbd_dev, u64 snap_id,
 	if (ret < sizeof (size_buf))
 		return -ERANGE;
 
-	*order = size_buf.order;
+	if (order)
+		*order = size_buf.order;
 	*snap_size = le64_to_cpu(size_buf.size);
 
 	dout("  snap_id 0x%016llx order = %u, snap_size = %llu\n",
@@ -3939,11 +3940,10 @@ static char *rbd_dev_v2_snap_info(struct rbd_device *rbd_dev, u32 which,
 		u64 *snap_size, u64 *snap_features)
 {
 	u64 snap_id;
-	u8 order;
 	int ret;
 
 	snap_id = rbd_dev->header.snapc->snaps[which];
-	ret = _rbd_dev_v2_snap_size(rbd_dev, snap_id, &order, snap_size);
+	ret = _rbd_dev_v2_snap_size(rbd_dev, snap_id, NULL, snap_size);
 	if (ret)
 		return ERR_PTR(ret);
 	ret = _rbd_dev_v2_snap_features(rbd_dev, snap_id, snap_features);