Merge branch 'for-linus2' of git://git.kernel.dk/linux-2.6-block

[safe/jmp/linux-2.6] / net / rds / threads.c

diff --git a/net/rds/threads.c b/net/rds/threads.c
index dd7e0ca..786c20e 100644 (file)
--- a/net/rds/threads.c
+++ b/net/rds/threads.c
@@ -170,8 +170,8 @@ void rds_shutdown_worker(struct work_struct *work)
                 * handler is supposed to check for state DISCONNECTING
                 */
                mutex_lock(&conn->c_cm_lock);
-               if (!rds_conn_transition(conn, RDS_CONN_UP, RDS_CONN_DISCONNECTING)
-                && !rds_conn_transition(conn, RDS_CONN_ERROR, RDS_CONN_DISCONNECTING)) {
+               if (!rds_conn_transition(conn, RDS_CONN_UP, RDS_CONN_DISCONNECTING) &&
+                   !rds_conn_transition(conn, RDS_CONN_ERROR, RDS_CONN_DISCONNECTING)) {
                        rds_conn_error(conn, "shutdown called in state %d\n",
                                        atomic_read(&conn->c_state));
                        mutex_unlock(&conn->c_cm_lock);
@@ -259,7 +259,7 @@ void rds_threads_exit(void)
 
 int __init rds_threads_init(void)
 {
-       rds_wq = create_singlethread_workqueue("krdsd");
+       rds_wq = create_workqueue("krdsd");
        if (rds_wq == NULL)
                return -ENOMEM;