diff --git a/[refs] b/[refs] index 38c8f95bfd5f..d0fbabc17682 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 797020117761eee21ef284cea90c51c690fca169 +refs/heads/master: 4ae98b4db3d0e9336d0b771636b7d053a1460805 diff --git a/trunk/drivers/block/drbd/drbd_state.c b/trunk/drivers/block/drbd/drbd_state.c index a16278cde3db..c3ec578918f2 100644 --- a/trunk/drivers/block/drbd/drbd_state.c +++ b/trunk/drivers/block/drbd/drbd_state.c @@ -1834,8 +1834,8 @@ _conn_request_state(struct drbd_tconn *tconn, union drbd_state mask, union drbd_ } if (rv < SS_SUCCESS && 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)); + conn_err(tconn, " mask = 0x%x val = 0x%x\n", mask.i, val.i); + conn_err(tconn, " old_conn:%s wanted_conn:%s\n", drbd_conn_str(oc), drbd_conn_str(val.conn)); } return rv; }