diff --git a/[refs] b/[refs] index 61b31f7c5f12..48cbe4e4634d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8cdc3433568a1741e95c1d4412a7fb9736d0eac +refs/heads/master: a01842ebeea315cbe4382703c065f671d8cd7622 diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c index 507cfccc1be7..70aa9603e368 100644 --- a/trunk/drivers/block/drbd/drbd_state.c +++ b/trunk/drivers/block/drbd/drbd_state.c @@ -1730,7 +1730,13 @@ _conn_request_state(struct drbd_tconn *tconn, union drbd_state mask, union drbd_ conn_err(tconn, "Could not kmalloc an acscw\n"); } -abort: + return rv; + abort: + if (flags & CS_VERBOSE) { + conn_err(tconn, "State change failed: %s\n", drbd_set_st_err_str(rv)); + conn_err(tconn, " state = { cs:%s }\n", drbd_conn_str(oc)); + conn_err(tconn, "wanted = { cs:%s }\n", drbd_conn_str(val.conn)); + } return rv; }