diff options
Diffstat (limited to 'net/rds/threads.c')
-rw-r--r-- | net/rds/threads.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rds/threads.c b/net/rds/threads.c index dd7e0cad1e7c..00fa10e59af8 100644 --- a/net/rds/threads.c +++ b/net/rds/threads.c | |||
@@ -170,8 +170,8 @@ void rds_shutdown_worker(struct work_struct *work) | |||
170 | * handler is supposed to check for state DISCONNECTING | 170 | * handler is supposed to check for state DISCONNECTING |
171 | */ | 171 | */ |
172 | mutex_lock(&conn->c_cm_lock); | 172 | mutex_lock(&conn->c_cm_lock); |
173 | if (!rds_conn_transition(conn, RDS_CONN_UP, RDS_CONN_DISCONNECTING) | 173 | if (!rds_conn_transition(conn, RDS_CONN_UP, RDS_CONN_DISCONNECTING) && |
174 | && !rds_conn_transition(conn, RDS_CONN_ERROR, RDS_CONN_DISCONNECTING)) { | 174 | !rds_conn_transition(conn, RDS_CONN_ERROR, RDS_CONN_DISCONNECTING)) { |
175 | rds_conn_error(conn, "shutdown called in state %d\n", | 175 | rds_conn_error(conn, "shutdown called in state %d\n", |
176 | atomic_read(&conn->c_state)); | 176 | atomic_read(&conn->c_state)); |
177 | mutex_unlock(&conn->c_cm_lock); | 177 | mutex_unlock(&conn->c_cm_lock); |