From: Alex Elder <elder@inktank.com>
Date: Fri, 31 Aug 2012 22:29:53 +0000 (-0500)
Subject: rbd: drop dev registration check for new snap
X-Git-Tag: v3.7-rc4~24^2~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86ff77bb68c6cda783b195a260f68fd5d32f7aaf;p=profile%2Fcommon%2Fkernel-common.git

rbd: drop dev registration check for new snap

By the time rbd_dev_snaps_register() gets called during rbd device
initialization, the main device will have already been registered.
Similarly, a header refresh will only occur for an rbd device whose
Linux device is registered.  There is therefore no need to verify
the main device is registered when registering a snapshot device.

For the time being, turn the check into a WARN_ON(), but it can
eventually just go away.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 2798804..fa99b94 100644
--- a/drivers/block/rbd.c
+++ b/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)) {