From c00472542d06a252ffe8199b271ee370f33e4d11 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Thu, 10 Jun 2010 16:55:15 +0200 Subject: [PATCH] --- yaml --- r: 213105 b: refs/heads/master c: 1616a25493cce727d582886f162c5bb0abd87e6a h: refs/heads/master i: 213103: e5f5fe5bc4d60fcf05649a6da08e3f2c873047fd v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ff701ed6f728..7537c28c19b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 999122bc188a4d0a4847bdf1915d357bd6ab53dc +refs/heads/master: 1616a25493cce727d582886f162c5bb0abd87e6a diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index c502648b7b40..40baddd94a5b 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -997,14 +997,8 @@ int __drbd_set_state(struct drbd_conf *mdev, /* If the old state was illegal as well, then let this happen...*/ - if (is_valid_state(mdev, os) == rv) { - dev_err(DEV, "Considering state change from bad state. " - "Error would be: '%s'\n", - drbd_set_st_err_str(rv)); - print_st(mdev, "old", os); - print_st(mdev, "new", ns); + if (is_valid_state(mdev, os) == rv) rv = is_valid_state_transition(mdev, ns, os); - } } else rv = is_valid_state_transition(mdev, ns, os); }