LU-6285 libcfs: get rid of deprecated cpumask function usage

[fs/lustre-release.git] / lustre / target / tgt_main.c

diff --git a/lustre/target/tgt_main.c b/lustre/target/tgt_main.c
index 1d2a933..d7791ca 100644 (file)
--- a/lustre/target/tgt_main.c
+++ b/lustre/target/tgt_main.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * lustre/target/tgt_main.c
@@ -35,6 +35,7 @@
 
 #include <obd.h>
 #include "tgt_internal.h"
+#include "../ptlrpc/ptlrpc_internal.h"
 
 int tgt_init(const struct lu_env *env, struct lu_target *lut,
             struct obd_device *obd, struct dt_device *dt,
@@ -66,8 +67,6 @@ int tgt_init(const struct lu_env *env, struct lu_target *lut,
        /* sptlrcp variables init */
        rwlock_init(&lut->lut_sptlrpc_lock);
        sptlrpc_rule_set_init(&lut->lut_sptlrpc_rset);
-       lut->lut_mds_capa = 1;
-       lut->lut_oss_capa = 1;
 
        spin_lock_init(&lut->lut_flags_lock);
        lut->lut_sync_lock_cancel = NEVER_SYNC_ON_CANCEL;
@@ -108,9 +107,10 @@ int tgt_init(const struct lu_env *env, struct lu_target *lut,
        lut->lut_txn_cb.dtc_txn_commit = NULL;
        lut->lut_txn_cb.dtc_cookie = lut;
        lut->lut_txn_cb.dtc_tag = LCT_DT_THREAD | LCT_MD_THREAD;
-       CFS_INIT_LIST_HEAD(&lut->lut_txn_cb.dtc_linkage);
+       INIT_LIST_HEAD(&lut->lut_txn_cb.dtc_linkage);
 
        dt_txn_callback_add(lut->lut_bottom, &lut->lut_txn_cb);
+       lut->lut_bottom->dd_lu_dev.ld_site->ls_tgt = lut;
 
        RETURN(0);
 out_obj:
@@ -143,7 +143,26 @@ void tgt_fini(const struct lu_env *env, struct lu_target *lut)
 EXPORT_SYMBOL(tgt_fini);
 
 /* context key constructor/destructor: tg_key_init, tg_key_fini */
-LU_KEY_INIT_FINI(tgt, struct tgt_thread_info);
+LU_KEY_INIT(tgt, struct tgt_thread_info);
+
+static void tgt_key_fini(const struct lu_context *ctx,
+                        struct lu_context_key *key, void *data)
+{
+       struct tgt_thread_info          *info = data;
+       struct thandle_exec_args        *args = &info->tti_tea;
+       int                             i;
+
+       for (i = 0; i < args->ta_alloc_args; i++) {
+               if (args->ta_args[i] != NULL)
+                       OBD_FREE_PTR(args->ta_args[i]);
+       }
+
+       if (args->ta_args != NULL)
+               OBD_FREE(args->ta_args, sizeof(args->ta_args[0]) *
+                                       args->ta_alloc_args);
+       OBD_FREE_PTR(info);
+}
+
 static void tgt_key_exit(const struct lu_context *ctx,
                         struct lu_context_key *key, void *data)
 {
@@ -160,7 +179,6 @@ struct lu_context_key tgt_thread_key = {
        .lct_fini = tgt_key_fini,
        .lct_exit = tgt_key_exit,
 };
-EXPORT_SYMBOL(tgt_thread_key);
 
 LU_KEY_INIT_GENERIC(tgt);