From 6a8818031336e7f770997bc1ecdfa9f4746005d6 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Fri, 31 Aug 2012 17:29:53 -0500
Subject: [PATCH] --- yaml --- r: 331672 b: refs/heads/master c:
 86ff77bb68c6cda783b195a260f68fd5d32f7aaf h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3333ec3611cd..701feba42613 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f308a3188b37f36bc5a078f5fe039a41714476e
+refs/heads/master: 86ff77bb68c6cda783b195a260f68fd5d32f7aaf
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index 27988045b48e..fa99b94b9dbb 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -2258,8 +2258,8 @@ static int rbd_dev_snaps_register(struct rbd_device *rbd_dev)
 	int ret = 0;
 
 	dout("%s called\n", __func__);
-	if (!device_is_registered(&rbd_dev->dev))
-		return 0;
+	if (WARN_ON(!device_is_registered(&rbd_dev->dev)))
+		return -EIO;
 
 	list_for_each_entry(snap, &rbd_dev->snaps, node) {
 		if (!rbd_snap_registered(snap)) {