From: Philipp Reisner <philipp.reisner@linbit.com>
To: linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>
Cc: drbd-dev@lists.linbit.com
Subject: [PATCH 05/10] drbd: Fixed state transitions in case reading meta data failes
Date: Thu, 13 Oct 2011 12:32:11 +0200 [thread overview]
Message-ID: <1318501936-11689-6-git-send-email-philipp.reisner@linbit.com> (raw)
In-Reply-To: <1318501936-11689-1-git-send-email-philipp.reisner@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
---
drivers/block/drbd/drbd_nl.c | 2 +-
drivers/block/drbd/drbd_state.c | 7 -------
2 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index ec4829b..0f8d473 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1685,7 +1685,7 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info)
force_diskless_dec:
put_ldev(mdev);
force_diskless:
- drbd_force_state(mdev, NS(disk, D_FAILED));
+ drbd_force_state(mdev, NS(disk, D_DISKLESS));
drbd_md_sync(mdev);
fail:
conn_reconfig_done(mdev->tconn);
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
index 3221743..65ba12b 100644
--- a/drivers/block/drbd/drbd_state.c
+++ b/drivers/block/drbd/drbd_state.c
@@ -655,13 +655,6 @@ is_valid_transition(union drbd_state os, union drbd_state ns)
if (ns.disk == D_FAILED && os.disk == D_DISKLESS)
rv = SS_IS_DISKLESS;
- /* if we are only D_ATTACHING yet,
- * we can (and should) go directly to D_DISKLESS. */
- if (ns.disk == D_FAILED && os.disk == D_ATTACHING) {
- printk("TODO: FIX ME\n");
- rv = SS_IS_DISKLESS;
- }
-
return rv;
}
--
1.7.4.1
next prev parent reply other threads:[~2011-10-13 10:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-13 10:32 [RFC 00/10] drbd: part 19 of adding multiple volume support to drbd Philipp Reisner
2011-10-13 10:32 ` [PATCH 01/10] drbd: allow ping-timeout of up to 30 seconds Philipp Reisner
2011-10-13 10:32 ` [PATCH 02/10] drbd: downgraded error printk to info Philipp Reisner
2011-10-13 10:32 ` [PATCH 03/10] drbd: Fixes from the 8.3 development branch Philipp Reisner
2011-10-13 10:32 ` [PATCH 04/10] drbd: Improve compatibility with drbd's older than 8.3.7 Philipp Reisner
2011-10-13 10:32 ` Philipp Reisner [this message]
2011-10-13 10:32 ` [PATCH 06/10] drbd: Improve the "unexpected packet" error messages Philipp Reisner
2011-10-13 10:32 ` [PATCH 07/10] drbd: detach from frozen backing device Philipp Reisner
2011-10-13 10:32 ` [PATCH 08/10] drbd: on attach, enforce clean meta data Philipp Reisner
2011-10-13 10:32 ` [PATCH 09/10] drbd: Fixed removal of volumes/devices from connected resources Philipp Reisner
2011-10-13 10:32 ` [PATCH 10/10] drbd: Eliminated the "notified peer" messages Philipp Reisner
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=1318501936-11689-6-git-send-email-philipp.reisner@linbit.com \
--to=philipp.reisner@linbit.com \
--cc=axboe@kernel.dk \
--cc=drbd-dev@lists.linbit.com \
--cc=linux-kernel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®