Whamcloud - gitweb
LU-3810 obd: Cleanup client import if client_obd_setup fails
[fs/lustre-release.git] / lustre / ldlm / ldlm_lib.c
index 2e3a1d5..6b18781 100644 (file)
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2010, 2012, Intel Corporation.
+ * Copyright (c) 2010, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -342,9 +342,9 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
         cli->cl_dirty = 0;
         cli->cl_avail_grant = 0;
        /* FIXME: Should limit this for the sum of all cl_dirty_max. */
-        cli->cl_dirty_max = OSC_MAX_DIRTY_DEFAULT * 1024 * 1024;
-        if (cli->cl_dirty_max >> CFS_PAGE_SHIFT > cfs_num_physpages / 8)
-                cli->cl_dirty_max = cfs_num_physpages << (CFS_PAGE_SHIFT - 3);
+       cli->cl_dirty_max = OSC_MAX_DIRTY_DEFAULT * 1024 * 1024;
+       if (cli->cl_dirty_max >> PAGE_CACHE_SHIFT > totalram_pages / 8)
+               cli->cl_dirty_max = totalram_pages << (PAGE_CACHE_SHIFT - 3);
         CFS_INIT_LIST_HEAD(&cli->cl_cache_waiters);
         CFS_INIT_LIST_HEAD(&cli->cl_loi_ready_list);
         CFS_INIT_LIST_HEAD(&cli->cl_loi_hp_ready_list);
@@ -370,12 +370,13 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
        cfs_atomic_set(&cli->cl_lru_in_list, 0);
        CFS_INIT_LIST_HEAD(&cli->cl_lru_list);
        client_obd_list_lock_init(&cli->cl_lru_list_lock);
+       cfs_atomic_set(&cli->cl_unstable_count, 0);
 
-        cfs_waitq_init(&cli->cl_destroy_waitq);
-        cfs_atomic_set(&cli->cl_destroy_in_flight, 0);
+       init_waitqueue_head(&cli->cl_destroy_waitq);
+       cfs_atomic_set(&cli->cl_destroy_in_flight, 0);
 #ifdef ENABLE_CHECKSUM
-        /* Turn on checksumming by default. */
-        cli->cl_checksum = 1;
+       /* Turn on checksumming by default. */
+       cli->cl_checksum = 1;
         /*
          * The supported checksum types will be worked out at connect time
          * Set cl_chksum* to CRC32 for now to avoid returning screwed info
@@ -390,17 +391,17 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
         * 1MB until we know what the performance looks like.
         * In the future this should likely be increased. LU-1431 */
        cli->cl_max_pages_per_rpc = min_t(int, PTLRPC_MAX_BRW_PAGES,
-                                         LNET_MTU >> CFS_PAGE_SHIFT);
-
-        if (!strcmp(name, LUSTRE_MDC_NAME)) {
-                cli->cl_max_rpcs_in_flight = MDC_MAX_RIF_DEFAULT;
-        } else if (cfs_num_physpages >> (20 - CFS_PAGE_SHIFT) <= 128 /* MB */) {
-                cli->cl_max_rpcs_in_flight = 2;
-        } else if (cfs_num_physpages >> (20 - CFS_PAGE_SHIFT) <= 256 /* MB */) {
-                cli->cl_max_rpcs_in_flight = 3;
-        } else if (cfs_num_physpages >> (20 - CFS_PAGE_SHIFT) <= 512 /* MB */) {
-                cli->cl_max_rpcs_in_flight = 4;
-        } else {
+                                         LNET_MTU >> PAGE_CACHE_SHIFT);
+
+       if (!strcmp(name, LUSTRE_MDC_NAME)) {
+               cli->cl_max_rpcs_in_flight = MDC_MAX_RIF_DEFAULT;
+       } else if (totalram_pages >> (20 - PAGE_CACHE_SHIFT) <= 128 /* MB */) {
+               cli->cl_max_rpcs_in_flight = 2;
+       } else if (totalram_pages >> (20 - PAGE_CACHE_SHIFT) <= 256 /* MB */) {
+               cli->cl_max_rpcs_in_flight = 3;
+       } else if (totalram_pages >> (20 - PAGE_CACHE_SHIFT) <= 512 /* MB */) {
+               cli->cl_max_rpcs_in_flight = 4;
+       } else {
                if (osc_on_mdt(obddev->obd_name))
                        cli->cl_max_rpcs_in_flight = MDS_OSC_MAX_RIF_DEFAULT;
                else
@@ -472,15 +473,16 @@ EXPORT_SYMBOL(client_obd_setup);
 
 int client_obd_cleanup(struct obd_device *obddev)
 {
-        ENTRY;
+       ENTRY;
 
-        ldlm_namespace_free_post(obddev->obd_namespace);
-        obddev->obd_namespace = NULL;
+       ldlm_namespace_free_post(obddev->obd_namespace);
+       obddev->obd_namespace = NULL;
 
-        LASSERT(obddev->u.cli.cl_import == NULL);
+       obd_cleanup_client_import(obddev);
+       LASSERT(obddev->u.cli.cl_import == NULL);
 
-        ldlm_put_ref();
-        RETURN(0);
+       ldlm_put_ref();
+       RETURN(0);
 }
 EXPORT_SYMBOL(client_obd_cleanup);
 
@@ -793,8 +795,11 @@ int target_handle_connect(struct ptlrpc_request *req)
 
        if (!target) {
                deuuidify(str, NULL, &target_start, &target_len);
-               LCONSOLE_ERROR_MSG(0x137, "UUID '%s' is not available for "
-                                  "connect (no target)\n", str);
+               LCONSOLE_ERROR_MSG(0x137, "%s: not available for connect "
+                                  "from %s (no target). If you are running "
+                                  "an HA pair check that the target is "
+                                  "mounted on the other server.\n", str,
+                                  libcfs_nid2str(req->rq_peer.nid));
                GOTO(out, rc = -ENODEV);
        }
 
@@ -803,11 +808,11 @@ int target_handle_connect(struct ptlrpc_request *req)
                spin_unlock(&target->obd_dev_lock);
 
                deuuidify(str, NULL, &target_start, &target_len);
-               LCONSOLE_ERROR_MSG(0x137, "%.*s: Not available for connect "
-                                  "from %s (%s)\n", target_len, target_start,
-                                  libcfs_nid2str(req->rq_peer.nid), 
-                                  (target->obd_stopping ?
-                                  "stopping" : "not set up"));
+               LCONSOLE_INFO("%.*s: Not available for connect from %s (%s)\n",
+                             target_len, target_start,
+                             libcfs_nid2str(req->rq_peer.nid),
+                             (target->obd_stopping ?
+                              "stopping" : "not set up"));
                GOTO(out, rc = -ENODEV);
        }
 
@@ -823,7 +828,7 @@ int target_handle_connect(struct ptlrpc_request *req)
        /* Make sure the target isn't cleaned up while we're here. Yes,
         * there's still a race between the above check and our incref here.
         * Really, class_uuid2obd should take the ref. */
-        targref = class_incref(target, __FUNCTION__, cfs_current());
+       targref = class_incref(target, __FUNCTION__, current);
 
        target->obd_conn_inprogress++;
        spin_unlock(&target->obd_dev_lock);
@@ -867,34 +872,30 @@ int target_handle_connect(struct ptlrpc_request *req)
         if (rc)
                 GOTO(out, rc);
 
-        if (lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_LIBCLIENT) {
-                if (!data) {
-                        DEBUG_REQ(D_WARNING, req, "Refusing old (unversioned) "
-                                  "libclient connection attempt");
-                        GOTO(out, rc = -EPROTO);
-                } else if (data->ocd_version < LUSTRE_VERSION_CODE -
-                                               LUSTRE_VERSION_ALLOWED_OFFSET ||
-                           data->ocd_version > LUSTRE_VERSION_CODE +
-                                               LUSTRE_VERSION_ALLOWED_OFFSET) {
-                        DEBUG_REQ(D_WARNING, req, "Refusing %s (%d.%d.%d.%d) "
-                                  "libclient connection attempt",
-                                  data->ocd_version < LUSTRE_VERSION_CODE ?
-                                  "old" : "new",
-                                  OBD_OCD_VERSION_MAJOR(data->ocd_version),
-                                  OBD_OCD_VERSION_MINOR(data->ocd_version),
-                                  OBD_OCD_VERSION_PATCH(data->ocd_version),
-                                  OBD_OCD_VERSION_FIX(data->ocd_version));
-                        data = req_capsule_server_sized_get(&req->rq_pill,
-                                                        &RMF_CONNECT_DATA,
-                                    offsetof(typeof(*data), ocd_version) +
-                                             sizeof(data->ocd_version));
-                        if (data) {
-                                data->ocd_connect_flags = OBD_CONNECT_VERSION;
-                                data->ocd_version = LUSTRE_VERSION_CODE;
-                        }
-                        GOTO(out, rc = -EPROTO);
-                }
-        }
+       if (lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_LIBCLIENT) {
+               if (data->ocd_version < LUSTRE_VERSION_CODE -
+                                              LUSTRE_VERSION_ALLOWED_OFFSET ||
+                   data->ocd_version > LUSTRE_VERSION_CODE +
+                                              LUSTRE_VERSION_ALLOWED_OFFSET) {
+                       DEBUG_REQ(D_WARNING, req, "Refusing %s (%d.%d.%d.%d) "
+                                 "libclient connection attempt",
+                                 data->ocd_version < LUSTRE_VERSION_CODE ?
+                                 "old" : "new",
+                                 OBD_OCD_VERSION_MAJOR(data->ocd_version),
+                                 OBD_OCD_VERSION_MINOR(data->ocd_version),
+                                 OBD_OCD_VERSION_PATCH(data->ocd_version),
+                                 OBD_OCD_VERSION_FIX(data->ocd_version));
+                       data = req_capsule_server_sized_get(&req->rq_pill,
+                                                           &RMF_CONNECT_DATA,
+                                   offsetof(typeof(*data), ocd_version) +
+                                            sizeof(data->ocd_version));
+                       if (data) {
+                               data->ocd_connect_flags = OBD_CONNECT_VERSION;
+                               data->ocd_version = LUSTRE_VERSION_CODE;
+                       }
+                       GOTO(out, rc = -EPROTO);
+               }
+       }
 
         if ((lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_INITIAL) &&
             (data->ocd_connect_flags & OBD_CONNECT_MDS))
@@ -1061,6 +1062,9 @@ dont_check_exports:
                         rc = obd_connect(req->rq_svc_thread->t_env,
                                          &export, target, &cluuid, data,
                                          client_nid);
+                       if (mds_conn && OBD_FAIL_CHECK(OBD_FAIL_TGT_RCVG_FLAG))
+                               lustre_msg_add_op_flags(req->rq_repmsg,
+                                               MSG_CONNECT_RECOVERING);
                         if (rc == 0)
                                 conn.cookie = export->exp_handle.h_cookie;
                 }
@@ -1113,11 +1117,7 @@ dont_check_exports:
          * XXX this will go away when shaver stops sending the "connect" handle
          * in the real "remote handle" field of the request --phik 24 Apr 2003
          */
-        if (req->rq_export != NULL)
-                class_export_put(req->rq_export);
-
-       /* Request takes one export reference. */
-       req->rq_export = class_export_get(export);
+       ptlrpc_request_change_export(req, export);
 
        spin_lock(&export->exp_lock);
        if (export->exp_conn_cnt >= lustre_msg_get_conn_cnt(req->rq_reqmsg)) {
@@ -1197,12 +1197,12 @@ dont_check_exports:
                        spin_unlock(&target->obd_recovery_task_lock);
                 }
 
-                cfs_atomic_inc(&target->obd_req_replay_clients);
-                cfs_atomic_inc(&target->obd_lock_replay_clients);
-                if (cfs_atomic_inc_return(&target->obd_connected_clients) ==
-                    target->obd_max_recoverable_clients)
-                        cfs_waitq_signal(&target->obd_next_transno_waitq);
-        }
+               cfs_atomic_inc(&target->obd_req_replay_clients);
+               cfs_atomic_inc(&target->obd_lock_replay_clients);
+               if (cfs_atomic_inc_return(&target->obd_connected_clients) ==
+                   target->obd_max_recoverable_clients)
+                       wake_up(&target->obd_next_transno_waitq);
+       }
 
         /* Tell the client we're in recovery, when client is involved in it. */
        if (target->obd_recovering && !lw_client)
@@ -1273,7 +1273,7 @@ out:
                target->obd_conn_inprogress--;
                spin_unlock(&target->obd_dev_lock);
 
-               class_decref(targref, __func__, cfs_current());
+               class_decref(targref, __func__, current);
        }
        if (rc)
                req->rq_status = rc;
@@ -1323,7 +1323,7 @@ EXPORT_SYMBOL(target_destroy_export);
  */
 static void target_request_copy_get(struct ptlrpc_request *req)
 {
-        class_export_rpc_get(req->rq_export);
+       class_export_rpc_inc(req->rq_export);
         LASSERT(cfs_list_empty(&req->rq_list));
         CFS_INIT_LIST_HEAD(&req->rq_replay_list);
 
@@ -1339,7 +1339,7 @@ static void target_request_copy_put(struct ptlrpc_request *req)
         LASSERT_ATOMIC_POS(&req->rq_export->exp_replay_count);
 
         cfs_atomic_dec(&req->rq_export->exp_replay_count);
-        class_export_rpc_put(req->rq_export);
+       class_export_rpc_dec(req->rq_export);
         ptlrpc_server_drop_request(req);
 }
 
@@ -1630,7 +1630,6 @@ check_and_start_recovery_timer(struct obd_device *obd,
 {
         int service_time = lustre_msg_get_service_time(req->rq_reqmsg);
         struct obd_device_target *obt = &obd->u.obt;
-        struct lustre_sb_info *lsi;
 
         if (!new_client && service_time)
                 /* Teach server about old server's estimates, as first guess
@@ -1650,12 +1649,9 @@ check_and_start_recovery_timer(struct obd_device *obd,
         service_time += 2 * INITIAL_CONNECT_TIMEOUT;
 
         LASSERT(obt->obt_magic == OBT_MAGIC);
-        lsi = s2lsi(obt->obt_sb);
-       if (!(lsi->lsi_flags | LDD_F_IR_CAPABLE))
-                service_time += 2 * (CONNECTION_SWITCH_MAX +
-                                     CONNECTION_SWITCH_INC);
-        if (service_time > obd->obd_recovery_timeout && !new_client)
-                extend_recovery_timer(obd, service_time, false);
+       service_time += 2 * (CONNECTION_SWITCH_MAX + CONNECTION_SWITCH_INC);
+       if (service_time > obd->obd_recovery_timeout && !new_client)
+               extend_recovery_timer(obd, service_time, false);
 }
 
 /** Health checking routines */
@@ -1795,36 +1791,36 @@ static int check_for_next_lock(struct obd_device *obd)
  * evict dead clients via health_check
  */
 static int target_recovery_overseer(struct obd_device *obd,
-                                    int (*check_routine)(struct obd_device *),
-                                    int (*health_check)(struct obd_export *))
+                                   int (*check_routine)(struct obd_device *),
+                                   int (*health_check)(struct obd_export *))
 {
 repeat:
-        cfs_wait_event(obd->obd_next_transno_waitq, check_routine(obd));
-        if (obd->obd_abort_recovery) {
-                CWARN("recovery is aborted, evict exports in recovery\n");
-                /** evict exports which didn't finish recovery yet */
-                class_disconnect_stale_exports(obd, exp_finished);
-                return 1;
-        } else if (obd->obd_recovery_expired) {
-                obd->obd_recovery_expired = 0;
-                /** If some clients died being recovered, evict them */
-                LCONSOLE_WARN("%s: recovery is timed out, "
-                              "evict stale exports\n", obd->obd_name);
-                /** evict cexports with no replay in queue, they are stalled */
-                class_disconnect_stale_exports(obd, health_check);
-                /** continue with VBR */
+       wait_event(obd->obd_next_transno_waitq, check_routine(obd));
+       if (obd->obd_abort_recovery) {
+               CWARN("recovery is aborted, evict exports in recovery\n");
+               /** evict exports which didn't finish recovery yet */
+               class_disconnect_stale_exports(obd, exp_finished);
+               return 1;
+       } else if (obd->obd_recovery_expired) {
+               obd->obd_recovery_expired = 0;
+               /** If some clients died being recovered, evict them */
+               LCONSOLE_WARN("%s: recovery is timed out, "
+                             "evict stale exports\n", obd->obd_name);
+               /** evict cexports with no replay in queue, they are stalled */
+               class_disconnect_stale_exports(obd, health_check);
+               /** continue with VBR */
                spin_lock(&obd->obd_dev_lock);
                obd->obd_version_recov = 1;
                spin_unlock(&obd->obd_dev_lock);
-                /**
-                 * reset timer, recovery will proceed with versions now,
-                 * timeout is set just to handle reconnection delays
-                 */
-                extend_recovery_timer(obd, RECONNECT_DELAY_MAX, true);
-                /** Wait for recovery events again, after evicting bad clients */
-                goto repeat;
-        }
-        return 0;
+               /**
+                * reset timer, recovery will proceed with versions now,
+                * timeout is set just to handle reconnection delays
+                */
+               extend_recovery_timer(obd, RECONNECT_DELAY_MAX, true);
+               /** Wait for recovery events again, after evicting bad clients */
+               goto repeat;
+       }
+       return 0;
 }
 
 static struct ptlrpc_request *target_next_replay_req(struct obd_device *obd)
@@ -1918,7 +1914,7 @@ static int handle_recovery_req(struct ptlrpc_thread *thread,
         if (req->rq_export->exp_disconnected)
                 GOTO(reqcopy_put, rc = 0);
 
-        rc = lu_context_init(&req->rq_recov_session, LCT_SESSION);
+        rc = lu_context_init(&req->rq_recov_session, LCT_SERVER_SESSION);
         if (rc) {
                 CERROR("Failure to initialize session: %d\n", rc);
                 GOTO(reqcopy_put, rc);
@@ -1975,19 +1971,12 @@ static int target_recovery_thread(void *arg)
         struct ptlrpc_request *req;
         struct target_recovery_data *trd = &obd->obd_recovery_data;
         unsigned long delta;
-        unsigned long flags;
         struct lu_env *env;
         struct ptlrpc_thread *thread = NULL;
         int rc = 0;
         ENTRY;
 
-        cfs_daemonize_ctxt("tgt_recov");
-
-        SIGNAL_MASK_LOCK(current, flags);
-        sigfillset(&current->blocked);
-        RECALC_SIGPENDING;
-        SIGNAL_MASK_UNLOCK(current, flags);
-
+       unshare_fs_struct();
         OBD_ALLOC_PTR(thread);
         if (thread == NULL)
                 RETURN(-ENOMEM);
@@ -2008,12 +1997,12 @@ static int target_recovery_thread(void *arg)
         thread->t_env = env;
         thread->t_id = -1; /* force filter_iobuf_get/put to use local buffers */
         env->le_ctx.lc_thread = thread;
-        thread->t_data = NULL;
-        thread->t_watchdog = NULL;
+       tgt_io_thread_init(thread); /* init thread_big_cache for IO requests */
+       thread->t_watchdog = NULL;
 
-        CDEBUG(D_HA, "%s: started recovery thread pid %d\n", obd->obd_name,
-               cfs_curproc_pid());
-        trd->trd_processing_task = cfs_curproc_pid();
+       CDEBUG(D_HA, "%s: started recovery thread pid %d\n", obd->obd_name,
+              current_pid());
+       trd->trd_processing_task = current_pid();
 
        spin_lock(&obd->obd_dev_lock);
        obd->obd_recovering = 1;
@@ -2032,11 +2021,11 @@ static int target_recovery_thread(void *arg)
         CDEBUG(D_INFO, "1: request replay stage - %d clients from t"LPU64"\n",
                cfs_atomic_read(&obd->obd_req_replay_clients),
                obd->obd_next_recovery_transno);
-        while ((req = target_next_replay_req(obd))) {
-                LASSERT(trd->trd_processing_task == cfs_curproc_pid());
-                DEBUG_REQ(D_HA, req, "processing t"LPD64" from %s",
-                          lustre_msg_get_transno(req->rq_reqmsg),
-                          libcfs_nid2str(req->rq_peer.nid));
+       while ((req = target_next_replay_req(obd))) {
+               LASSERT(trd->trd_processing_task == current_pid());
+               DEBUG_REQ(D_HA, req, "processing t"LPD64" from %s",
+                         lustre_msg_get_transno(req->rq_reqmsg),
+                         libcfs_nid2str(req->rq_peer.nid));
                 handle_recovery_req(thread, req,
                                     trd->trd_recovery_handler);
                 /**
@@ -2056,10 +2045,10 @@ static int target_recovery_thread(void *arg)
          */
         CDEBUG(D_INFO, "2: lock replay stage - %d clients\n",
                cfs_atomic_read(&obd->obd_lock_replay_clients));
-        while ((req = target_next_replay_lock(obd))) {
-                LASSERT(trd->trd_processing_task == cfs_curproc_pid());
-                DEBUG_REQ(D_HA, req, "processing lock from %s: ",
-                          libcfs_nid2str(req->rq_peer.nid));
+       while ((req = target_next_replay_lock(obd))) {
+               LASSERT(trd->trd_processing_task == current_pid());
+               DEBUG_REQ(D_HA, req, "processing lock from %s: ",
+                         libcfs_nid2str(req->rq_peer.nid));
                 handle_recovery_req(thread, req,
                                     trd->trd_recovery_handler);
                 target_request_copy_put(req);
@@ -2081,22 +2070,22 @@ static int target_recovery_thread(void *arg)
        spin_lock(&obd->obd_recovery_task_lock);
        target_cancel_recovery_timer(obd);
        spin_unlock(&obd->obd_recovery_task_lock);
-        while ((req = target_next_final_ping(obd))) {
-                LASSERT(trd->trd_processing_task == cfs_curproc_pid());
-                DEBUG_REQ(D_HA, req, "processing final ping from %s: ",
-                          libcfs_nid2str(req->rq_peer.nid));
+       while ((req = target_next_final_ping(obd))) {
+               LASSERT(trd->trd_processing_task == current_pid());
+               DEBUG_REQ(D_HA, req, "processing final ping from %s: ",
+                         libcfs_nid2str(req->rq_peer.nid));
                 handle_recovery_req(thread, req,
                                     trd->trd_recovery_handler);
                 target_request_copy_put(req);
         }
 
-        delta = (jiffies - delta) / CFS_HZ;
-        CDEBUG(D_INFO,"4: recovery completed in %lus - %d/%d reqs/locks\n",
-              delta, obd->obd_replayed_requests, obd->obd_replayed_locks);
-        if (delta > OBD_RECOVERY_TIME_SOFT) {
-                CWARN("too long recovery - read logs\n");
-                libcfs_debug_dumplog();
-        }
+       delta = (jiffies - delta) / HZ;
+       CDEBUG(D_INFO,"4: recovery completed in %lus - %d/%d reqs/locks\n",
+             delta, obd->obd_replayed_requests, obd->obd_replayed_locks);
+       if (delta > OBD_RECOVERY_TIME_SOFT) {
+               CWARN("too long recovery - read logs\n");
+               libcfs_debug_dumplog();
+       }
 
         target_finish_recovery(obd);
 
@@ -2104,30 +2093,33 @@ static int target_recovery_thread(void *arg)
         trd->trd_processing_task = 0;
        complete(&trd->trd_finishing);
 
-        OBD_FREE_PTR(thread);
-        OBD_FREE_PTR(env);
-        RETURN(rc);
+       tgt_io_thread_done(thread);
+       OBD_FREE_PTR(thread);
+       OBD_FREE_PTR(env);
+       RETURN(rc);
 }
 
 static int target_start_recovery_thread(struct lu_target *lut,
                                         svc_handler_t handler)
 {
-        struct obd_device *obd = lut->lut_obd;
-        int rc = 0;
-        struct target_recovery_data *trd = &obd->obd_recovery_data;
+       struct obd_device *obd = lut->lut_obd;
+       int rc = 0;
+       struct target_recovery_data *trd = &obd->obd_recovery_data;
 
-        memset(trd, 0, sizeof(*trd));
+       memset(trd, 0, sizeof(*trd));
        init_completion(&trd->trd_starting);
        init_completion(&trd->trd_finishing);
-        trd->trd_recovery_handler = handler;
+       trd->trd_recovery_handler = handler;
 
-        if (cfs_create_thread(target_recovery_thread, lut, 0) > 0) {
+       if (!IS_ERR(kthread_run(target_recovery_thread,
+                               lut, "tgt_recov"))) {
                wait_for_completion(&trd->trd_starting);
-                LASSERT(obd->obd_recovering != 0);
-        } else
-                rc = -ECHILD;
+               LASSERT(obd->obd_recovering != 0);
+       } else {
+               rc = -ECHILD;
+       }
 
-        return rc;
+       return rc;
 }
 
 void target_stop_recovery_thread(struct obd_device *obd)
@@ -2139,7 +2131,7 @@ void target_stop_recovery_thread(struct obd_device *obd)
                if (obd->obd_recovering) {
                        CERROR("%s: Aborting recovery\n", obd->obd_name);
                        obd->obd_abort_recovery = 1;
-                       cfs_waitq_signal(&obd->obd_next_transno_waitq);
+                       wake_up(&obd->obd_next_transno_waitq);
                }
                spin_unlock(&obd->obd_dev_lock);
                wait_for_completion(&trd->trd_finishing);
@@ -2157,15 +2149,15 @@ EXPORT_SYMBOL(target_recovery_fini);
 
 static void target_recovery_expired(unsigned long castmeharder)
 {
-        struct obd_device *obd = (struct obd_device *)castmeharder;
-        CDEBUG(D_HA, "%s: recovery timed out; %d clients are still in recovery"
-               " after %lds (%d clients connected)\n",
-               obd->obd_name, cfs_atomic_read(&obd->obd_lock_replay_clients),
-               cfs_time_current_sec()- obd->obd_recovery_start,
-               cfs_atomic_read(&obd->obd_connected_clients));
-
-        obd->obd_recovery_expired = 1;
-        cfs_waitq_signal(&obd->obd_next_transno_waitq);
+       struct obd_device *obd = (struct obd_device *)castmeharder;
+       CDEBUG(D_HA, "%s: recovery timed out; %d clients are still in recovery"
+              " after %lds (%d clients connected)\n",
+              obd->obd_name, cfs_atomic_read(&obd->obd_lock_replay_clients),
+              cfs_time_current_sec()- obd->obd_recovery_start,
+              cfs_atomic_read(&obd->obd_connected_clients));
+
+       obd->obd_recovery_expired = 1;
+       wake_up(&obd->obd_next_transno_waitq);
 }
 
 void target_recovery_init(struct lu_target *lut, svc_handler_t handler)
@@ -2235,19 +2227,19 @@ int target_queue_recovery_request(struct ptlrpc_request *req,
         __u64 transno = lustre_msg_get_transno(req->rq_reqmsg);
         ENTRY;
 
-        if (obd->obd_recovery_data.trd_processing_task == cfs_curproc_pid()) {
-                /* Processing the queue right now, don't re-add. */
-                RETURN(1);
-        }
+       if (obd->obd_recovery_data.trd_processing_task == current_pid()) {
+               /* Processing the queue right now, don't re-add. */
+               RETURN(1);
+       }
 
         target_process_req_flags(obd, req);
 
         if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_LOCK_REPLAY_DONE) {
                 /* client declares he's ready to complete recovery
                  * so, we put the request on th final queue */
-                target_request_copy_get(req);
-                DEBUG_REQ(D_HA, req, "queue final req");
-                cfs_waitq_signal(&obd->obd_next_transno_waitq);
+               target_request_copy_get(req);
+               DEBUG_REQ(D_HA, req, "queue final req");
+               wake_up(&obd->obd_next_transno_waitq);
                spin_lock(&obd->obd_recovery_task_lock);
                if (obd->obd_recovering) {
                        cfs_list_add_tail(&req->rq_list,
@@ -2264,7 +2256,7 @@ int target_queue_recovery_request(struct ptlrpc_request *req,
                /* client declares he's ready to replay locks */
                target_request_copy_get(req);
                DEBUG_REQ(D_HA, req, "queue lock replay req");
-               cfs_waitq_signal(&obd->obd_next_transno_waitq);
+               wake_up(&obd->obd_next_transno_waitq);
                spin_lock(&obd->obd_recovery_task_lock);
                LASSERT(obd->obd_recovering);
                /* usually due to recovery abort */
@@ -2356,7 +2348,7 @@ int target_queue_recovery_request(struct ptlrpc_request *req,
 
         obd->obd_requests_queued_for_recovery++;
        spin_unlock(&obd->obd_recovery_task_lock);
-       cfs_waitq_signal(&obd->obd_next_transno_waitq);
+       wake_up(&obd->obd_next_transno_waitq);
        RETURN(0);
 }
 EXPORT_SYMBOL(target_queue_recovery_request);