All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Elder <elder@inktank.com>
To: ceph-devel@vger.kernel.org
Subject: [PATCH 7/9] rbd: drop dev registration check for new snap
Date: Fri, 07 Sep 2012 10:45:18 -0500	[thread overview]
Message-ID: <504A168E.6090906@inktank.com> (raw)
In-Reply-To: <504A152E.4000905@inktank.com>

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>
---
 drivers/block/rbd.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 8e82610..e6af38f 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -2253,8 +2253,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)) {
-- 
1.7.9.5


  parent reply	other threads:[~2012-09-07 15:45 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-07 15:39 [PATCH 0/9] rbd: rearrange initialization sequence Alex Elder
2012-09-07 15:44 ` [PATCH 1/9] rbd: assign header name later Alex Elder
2012-09-10 22:41   ` Josh Durgin
2012-09-07 15:44 ` [PATCH 2/9] rbd: defer registering snapshot devices Alex Elder
2012-09-11 14:56   ` Josh Durgin
2012-09-07 15:44 ` [PATCH 3/9] rbd: call set_snap() before snap_devs_update() Alex Elder
2012-09-11 14:58   ` Josh Durgin
2012-09-07 15:44 ` [PATCH 4/9] rbd: read the header before registering device Alex Elder
2012-09-11 15:02   ` Josh Durgin
2012-09-07 15:45 ` [PATCH 5/9] rbd: defer setting device id Alex Elder
2012-09-11 15:03   ` Josh Durgin
2012-09-07 15:45 ` [PATCH 6/9] rbd: call rbd_init_disk() sooner Alex Elder
2012-09-11 15:06   ` Josh Durgin
2012-09-07 15:45 ` Alex Elder [this message]
2012-09-11 15:07   ` [PATCH 7/9] rbd: drop dev registration check for new snap Josh Durgin
2012-09-07 15:45 ` [PATCH 8/9] rbd: set initial capacity in rbd_init_disk() Alex Elder
2012-09-11 15:07   ` Josh Durgin
2012-09-07 15:45 ` [PATCH 9/9] rbd: set up watch before announcing disk Alex Elder
2012-09-11 15:08   ` Josh Durgin
2012-09-07 15:50 ` [PATCH 0/9] rbd: rearrange initialization sequence Alex Elder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=504A168E.6090906@inktank.com \
    --to=elder@inktank.com \
    --cc=ceph-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.