diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /net/rds/threads.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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); |