X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fgenops.c;h=9508495baa0925ceb74b630d66c19f06402bd385;hp=90b4b4647aae9e7a3c1e927a4e15b5b22e843457;hb=392dab3c01bb802892466f9a05ef1b56406b8522;hpb=1a7ff02c1fbb8e85ac2e8fa458ba3fb810a76ea4 diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c index 90b4b46..9508495 100644 --- a/lustre/obdclass/genops.c +++ b/lustre/obdclass/genops.c @@ -23,7 +23,7 @@ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2016, Intel Corporation. + * Copyright (c) 2011, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -38,7 +38,8 @@ #define DEBUG_SUBSYSTEM S_CLASS #include -#include +#include +#include #include #include #include @@ -51,15 +52,9 @@ DEFINE_RWLOCK(obd_dev_lock); static struct obd_device *obd_devs[MAX_OBD_DEVICES]; static struct kmem_cache *obd_device_cachep; -struct kmem_cache *obdo_cachep; -EXPORT_SYMBOL(obdo_cachep); -static struct kmem_cache *import_cachep; -static LIST_HEAD(obd_zombie_imports); -static LIST_HEAD(obd_zombie_exports); -static DEFINE_SPINLOCK(obd_zombie_impexp_lock); +static struct workqueue_struct *zombie_wq; -static void obd_zombie_impexp_notify(void); static void obd_zombie_export_add(struct obd_export *exp); static void obd_zombie_import_add(struct obd_import *imp); static void print_export_data(struct obd_export *exp, @@ -165,10 +160,9 @@ void class_put_type(struct obd_type *type) static void class_sysfs_release(struct kobject *kobj) { - struct obd_type *type = container_of(kobj, struct obd_type, - typ_kobj); + struct obd_type *type = container_of(kobj, struct obd_type, typ_kobj); - complete(&type->typ_kobj_unregister); + OBD_FREE(type, sizeof(*type)); } static struct kobj_type class_ktype = { @@ -176,29 +170,86 @@ static struct kobj_type class_ktype = { .release = class_sysfs_release, }; +#ifdef HAVE_SERVER_SUPPORT +struct obd_type *class_setup_tunables(const char *name) +{ + struct obd_type *type; + struct kobject *kobj; + int rc; + + kobj = kset_find_obj(lustre_kset, name); + if (kobj) { + kobject_put(kobj); + return ERR_PTR(-EEXIST); + } + + OBD_ALLOC(type, sizeof(*type)); + if (!type) + return ERR_PTR(-ENOMEM); + + type->typ_kobj.kset = lustre_kset; + kobject_init(&type->typ_kobj, &class_ktype); + rc = kobject_add(&type->typ_kobj, &lustre_kset->kobj, "%s", name); + if (rc) { + kobject_put(&type->typ_kobj); + return ERR_PTR(rc); + } + return type; +} +EXPORT_SYMBOL(class_setup_tunables); +#endif /* HAVE_SERVER_SUPPORT */ + #define CLASS_MAX_NAME 1024 int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops, bool enable_proc, struct lprocfs_vars *vars, const char *name, struct lu_device_type *ldt) { - struct obd_type *type; - int rc = 0; - ENTRY; + struct obd_type *type; +#ifdef HAVE_SERVER_SUPPORT + struct kobject *kobj; +#endif /* HAVE_SERVER_SUPPORT */ + int rc; - /* sanity check */ - LASSERT(strnlen(name, CLASS_MAX_NAME) < CLASS_MAX_NAME); + ENTRY; + /* sanity check */ + LASSERT(strnlen(name, CLASS_MAX_NAME) < CLASS_MAX_NAME); if (class_search_type(name)) { CDEBUG(D_IOCTL, "Type %s already registered\n", name); RETURN(-EEXIST); } - rc = -ENOMEM; +#ifdef HAVE_SERVER_SUPPORT + kobj = kset_find_obj(lustre_kset, name); + if (kobj) { + type = container_of(kobj, struct obd_type, typ_kobj); + + goto dir_exist; + } +#endif /* HAVE_SERVER_SUPPORT */ + OBD_ALLOC(type, sizeof(*type)); if (type == NULL) - RETURN(rc); + RETURN(-ENOMEM); + type->typ_kobj.kset = lustre_kset; + rc = kobject_init_and_add(&type->typ_kobj, &class_ktype, + &lustre_kset->kobj, "%s", name); + if (rc) + GOTO(failed, rc); + + type->typ_debugfs_entry = ldebugfs_register(name, debugfs_lustre_root, + vars, type); + if (IS_ERR_OR_NULL(type->typ_debugfs_entry)) { + rc = type->typ_debugfs_entry ? PTR_ERR(type->typ_debugfs_entry) + : -ENOMEM; + type->typ_debugfs_entry = NULL; + GOTO(failed, rc); + } +#ifdef HAVE_SERVER_SUPPORT +dir_exist: +#endif /* HAVE_SERVER_SUPPORT */ OBD_ALLOC_PTR(type->typ_dt_ops); OBD_ALLOC_PTR(type->typ_md_ops); OBD_ALLOC(type->typ_name, strlen(name) + 1); @@ -216,10 +267,10 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops, spin_lock_init(&type->obd_type_lock); #ifdef CONFIG_PROC_FS - if (enable_proc) { + if (enable_proc && !type->typ_procroot) { type->typ_procroot = lprocfs_register(type->typ_name, proc_lustre_root, - vars, type); + NULL, type); if (IS_ERR(type->typ_procroot)) { rc = PTR_ERR(type->typ_procroot); type->typ_procroot = NULL; @@ -227,20 +278,11 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops, } } #endif - type->typ_kobj.kset = lustre_kset; - init_completion(&type->typ_kobj_unregister); - rc = kobject_init_and_add(&type->typ_kobj, &class_ktype, - &lustre_kset->kobj, "%s", type->typ_name); - if (rc) - GOTO(failed, rc); - if (ldt) { type->typ_lu = ldt; rc = lu_device_type_init(ldt); - if (rc) { - kobject_put(&type->typ_kobj); + if (rc) GOTO(failed, rc); - } } spin_lock(&obd_types_lock); @@ -250,6 +292,12 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops, RETURN(0); failed: +#ifdef HAVE_SERVER_SUPPORT + if (type->typ_sym_filter) + type->typ_debugfs_entry = NULL; +#endif + if (!IS_ERR_OR_NULL(type->typ_debugfs_entry)) + ldebugfs_remove(&type->typ_debugfs_entry); if (type->typ_name != NULL) { #ifdef CONFIG_PROC_FS if (type->typ_procroot != NULL) @@ -261,8 +309,9 @@ failed: OBD_FREE_PTR(type->typ_md_ops); if (type->typ_dt_ops != NULL) OBD_FREE_PTR(type->typ_dt_ops); - OBD_FREE(type, sizeof(*type)); - RETURN(rc); + kobject_put(&type->typ_kobj); + + RETURN(rc); } EXPORT_SYMBOL(class_register_type); @@ -285,9 +334,6 @@ int class_unregister_type(const char *name) RETURN(-EBUSY); } - kobject_put(&type->typ_kobj); - wait_for_completion(&type->typ_kobj_unregister); - /* we do not use type->typ_procroot as for compatibility purposes * other modules can share names (i.e. lod can use lov entry). so * we can't reference pointer as it can get invalided when another @@ -298,6 +344,13 @@ int class_unregister_type(const char *name) if (type->typ_procsym != NULL) lprocfs_remove(&type->typ_procsym); #endif +#ifdef HAVE_SERVER_SUPPORT + if (type->typ_sym_filter) + type->typ_debugfs_entry = NULL; +#endif + if (!IS_ERR_OR_NULL(type->typ_debugfs_entry)) + ldebugfs_remove(&type->typ_debugfs_entry); + if (type->typ_lu) lu_device_type_fini(type->typ_lu); @@ -309,8 +362,9 @@ int class_unregister_type(const char *name) OBD_FREE_PTR(type->typ_dt_ops); if (type->typ_md_ops != NULL) OBD_FREE_PTR(type->typ_md_ops); - OBD_FREE(type, sizeof(*type)); - RETURN(0); + kobject_put(&type->typ_kobj); + + RETURN(0); } /* class_unregister_type */ EXPORT_SYMBOL(class_unregister_type); @@ -369,12 +423,11 @@ struct obd_device *class_newdev(const char *type_name, const char *name, spin_lock_init(&newdev->obd_osfs_lock); /* newdev->obd_osfs_age must be set to a value in the distant * past to guarantee a fresh statfs is fetched on mount. */ - newdev->obd_osfs_age = cfs_time_shift_64(-1000); + newdev->obd_osfs_age = ktime_get_seconds() - 1000; /* XXX belongs in setup not attach */ init_rwsem(&newdev->obd_observer_link_sem); /* recovery data */ - init_timer(&newdev->obd_recovery_timer); spin_lock_init(&newdev->obd_recovery_task_lock); init_waitqueue_head(&newdev->obd_next_transno_waitq); init_waitqueue_head(&newdev->obd_evict_inprogress_waitq); @@ -392,7 +445,7 @@ struct obd_device *class_newdev(const char *type_name, const char *name, newdev->obd_conn_inprogress = 0; - strncpy(newdev->obd_uuid.uuid, uuid, strlen(uuid)); + strncpy(newdev->obd_uuid.uuid, uuid, UUID_MAX); CDEBUG(D_IOCTL, "Allocate new device %s (%p)\n", newdev->obd_name, newdev); @@ -847,14 +900,6 @@ void obd_cleanup_caches(void) kmem_cache_destroy(obd_device_cachep); obd_device_cachep = NULL; } - if (obdo_cachep) { - kmem_cache_destroy(obdo_cachep); - obdo_cachep = NULL; - } - if (import_cachep) { - kmem_cache_destroy(import_cachep); - import_cachep = NULL; - } EXIT; } @@ -871,19 +916,6 @@ int obd_init_caches(void) if (!obd_device_cachep) GOTO(out, rc = -ENOMEM); - LASSERT(obdo_cachep == NULL); - obdo_cachep = kmem_cache_create("ll_obdo_cache", sizeof(struct obdo), - 0, 0, NULL); - if (!obdo_cachep) - GOTO(out, rc = -ENOMEM); - - LASSERT(import_cachep == NULL); - import_cachep = kmem_cache_create("ll_import_cache", - sizeof(struct obd_import), - 0, 0, NULL); - if (!import_cachep) - GOTO(out, rc = -ENOMEM); - RETURN(0); out: obd_cleanup_caches(); @@ -920,18 +952,6 @@ struct obd_device *class_exp2obd(struct obd_export *exp) } EXPORT_SYMBOL(class_exp2obd); -struct obd_device *class_conn2obd(struct lustre_handle *conn) -{ - struct obd_export *export; - export = class_conn2export(conn); - if (export) { - struct obd_device *obd = export->exp_obd; - class_export_put(export); - return obd; - } - return NULL; -} - struct obd_import *class_exp2cliimp(struct obd_export *exp) { struct obd_device *obd = exp->exp_obd; @@ -941,14 +961,6 @@ struct obd_import *class_exp2cliimp(struct obd_export *exp) } EXPORT_SYMBOL(class_exp2cliimp); -struct obd_import *class_conn2cliimp(struct lustre_handle *conn) -{ - struct obd_device *obd = class_conn2obd(conn); - if (obd == NULL) - return NULL; - return obd->u.cli.cl_import; -} - /* Export management functions */ static void class_export_destroy(struct obd_export *exp) { @@ -1032,6 +1044,15 @@ void class_export_put(struct obd_export *exp) } } EXPORT_SYMBOL(class_export_put); + +static void obd_zombie_exp_cull(struct work_struct *ws) +{ + struct obd_export *export; + + export = container_of(ws, struct obd_export, exp_zombie_work); + class_export_destroy(export); +} + /* Creates a new export, adds it to the hash table, and returns a * pointer to it. The refcount is 2: one for the hash reference, and * one for the pointer returned by this function. */ @@ -1065,7 +1086,7 @@ struct obd_export *__class_new_export(struct obd_device *obd, spin_lock_init(&export->exp_uncommitted_replies_lock); INIT_LIST_HEAD(&export->exp_uncommitted_replies); INIT_LIST_HEAD(&export->exp_req_replay_queue); - INIT_LIST_HEAD(&export->exp_handle.h_link); + INIT_LIST_HEAD_RCU(&export->exp_handle.h_link); INIT_LIST_HEAD(&export->exp_hp_rpcs); INIT_LIST_HEAD(&export->exp_reg_rpcs); class_handle_hash(&export->exp_handle, &export_handle_ops); @@ -1078,6 +1099,7 @@ struct obd_export *__class_new_export(struct obd_device *obd, spin_lock_init(&export->exp_bl_list_lock); INIT_LIST_HEAD(&export->exp_bl_list); INIT_LIST_HEAD(&export->exp_stale_list); + INIT_WORK(&export->exp_zombie_work, obd_zombie_exp_cull); export->exp_sp_peer = LUSTRE_SP_ANY; export->exp_flvr.sf_rpc = SPTLRPC_FLVR_INVALID; @@ -1194,7 +1216,7 @@ void class_unlink_export(struct obd_export *exp) EXPORT_SYMBOL(class_unlink_export); /* Import management functions */ -static void class_import_destroy(struct obd_import *imp) +static void obd_zombie_import_free(struct obd_import *imp) { ENTRY; @@ -1217,20 +1239,10 @@ static void class_import_destroy(struct obd_import *imp) LASSERT(imp->imp_sec == NULL); class_decref(imp->imp_obd, "import", imp); - OBD_FREE_RCU(imp, sizeof(*imp), &imp->imp_handle); - EXIT; -} - -static void import_handle_addref(void *import) -{ - class_import_get(import); + OBD_FREE_PTR(imp); + EXIT; } -static struct portals_handle_ops import_handle_ops = { - .hop_addref = import_handle_addref, - .hop_free = NULL, -}; - struct obd_import *class_import_get(struct obd_import *import) { atomic_inc(&import->imp_refcount); @@ -1245,7 +1257,6 @@ void class_import_put(struct obd_import *imp) { ENTRY; - LASSERT(list_empty(&imp->imp_zombie_chain)); LASSERT_ATOMIC_GT_LT(&imp->imp_refcount, 0, LI_POISON); CDEBUG(D_INFO, "import %p refcount=%d obd=%s\n", imp, @@ -1275,6 +1286,14 @@ static void init_imp_at(struct imp_at *at) { } } +static void obd_zombie_imp_cull(struct work_struct *ws) +{ + struct obd_import *import; + + import = container_of(ws, struct obd_import, imp_zombie_work); + obd_zombie_import_free(import); +} + struct obd_import *class_new_import(struct obd_device *obd) { struct obd_import *imp; @@ -1285,7 +1304,6 @@ struct obd_import *class_new_import(struct obd_device *obd) return NULL; INIT_LIST_HEAD(&imp->imp_pinger_chain); - INIT_LIST_HEAD(&imp->imp_zombie_chain); INIT_LIST_HEAD(&imp->imp_replay_list); INIT_LIST_HEAD(&imp->imp_sending_list); INIT_LIST_HEAD(&imp->imp_delayed_list); @@ -1299,6 +1317,7 @@ struct obd_import *class_new_import(struct obd_device *obd) imp->imp_obd = class_incref(obd, "import", imp); mutex_init(&imp->imp_sec_mutex); init_waitqueue_head(&imp->imp_recovery_waitq); + INIT_WORK(&imp->imp_zombie_work, obd_zombie_imp_cull); if (curr_pid_ns->child_reaper) imp->imp_sec_refpid = curr_pid_ns->child_reaper->pid; @@ -1311,8 +1330,6 @@ struct obd_import *class_new_import(struct obd_device *obd) atomic_set(&imp->imp_replay_inflight, 0); atomic_set(&imp->imp_inval_count, 0); INIT_LIST_HEAD(&imp->imp_conn_list); - INIT_LIST_HEAD(&imp->imp_handle.h_link); - class_handle_hash(&imp->imp_handle, &import_handle_ops); init_imp_at(&imp->imp_at); /* the default magic is V2, will be used in connect RPC, and @@ -1328,8 +1345,6 @@ void class_destroy_import(struct obd_import *import) LASSERT(import != NULL); LASSERT(import != LP_POISON); - class_handle_unhash(&import->imp_handle); - spin_lock(&import->imp_lock); import->imp_generation++; spin_unlock(&import->imp_lock); @@ -1612,13 +1627,12 @@ void class_disconnect_stale_exports(struct obd_device *obd, spin_unlock(&exp->exp_lock); list_move(&exp->exp_obd_chain, &work_list); - evicted++; - CDEBUG(D_HA, "%s: disconnect stale client %s@%s\n", - obd->obd_name, exp->exp_client_uuid.uuid, - exp->exp_connection == NULL ? "" : - libcfs_nid2str(exp->exp_connection->c_peer.nid)); - print_export_data(exp, "EVICTING", 0, D_HA); - } + evicted++; + CDEBUG(D_HA, "%s: disconnect stale client %s@%s\n", + obd->obd_name, exp->exp_client_uuid.uuid, + obd_export_nid2str(exp)); + print_export_data(exp, "EVICTING", 0, D_HA); + } spin_unlock(&obd->obd_dev_lock); if (evicted) @@ -1669,15 +1683,6 @@ void class_fail_export(struct obd_export *exp) } EXPORT_SYMBOL(class_fail_export); -char *obd_export_nid2str(struct obd_export *exp) -{ - if (exp->exp_connection != NULL) - return libcfs_nid2str(exp->exp_connection->c_peer.nid); - - return "(no nid)"; -} -EXPORT_SYMBOL(obd_export_nid2str); - int obd_export_evict_by_nid(struct obd_device *obd, const char *nid) { struct cfs_hash *nid_hash; @@ -1815,10 +1820,6 @@ void dump_exports(struct obd_device *obd, int locks, int debug_level) list_for_each_entry(exp, &obd->obd_delayed_exports, exp_obd_chain) print_export_data(exp, "DELAYED", locks, debug_level); spin_unlock(&obd->obd_dev_lock); - spin_lock(&obd_zombie_impexp_lock); - list_for_each_entry(exp, &obd_zombie_exports, exp_obd_chain) - print_export_data(exp, "ZOMBIE", locks, debug_level); - spin_unlock(&obd_zombie_impexp_lock); } void obd_exports_barrier(struct obd_device *obd) @@ -1845,83 +1846,6 @@ void obd_exports_barrier(struct obd_device *obd) } EXPORT_SYMBOL(obd_exports_barrier); -/* Total amount of zombies to be destroyed */ -static int zombies_count = 0; - -/** - * kill zombie imports and exports - */ -void obd_zombie_impexp_cull(void) -{ - struct obd_import *import; - struct obd_export *export; - ENTRY; - - do { - spin_lock(&obd_zombie_impexp_lock); - - import = NULL; - if (!list_empty(&obd_zombie_imports)) { - import = list_entry(obd_zombie_imports.next, - struct obd_import, - imp_zombie_chain); - list_del_init(&import->imp_zombie_chain); - } - - export = NULL; - if (!list_empty(&obd_zombie_exports)) { - export = list_entry(obd_zombie_exports.next, - struct obd_export, - exp_obd_chain); - list_del_init(&export->exp_obd_chain); - } - - spin_unlock(&obd_zombie_impexp_lock); - - if (import != NULL) { - class_import_destroy(import); - spin_lock(&obd_zombie_impexp_lock); - zombies_count--; - spin_unlock(&obd_zombie_impexp_lock); - } - - if (export != NULL) { - class_export_destroy(export); - spin_lock(&obd_zombie_impexp_lock); - zombies_count--; - spin_unlock(&obd_zombie_impexp_lock); - } - - cond_resched(); - } while (import != NULL || export != NULL); - EXIT; -} - -static DECLARE_COMPLETION(obd_zombie_start); -static DECLARE_COMPLETION(obd_zombie_stop); -static unsigned long obd_zombie_flags; -static DECLARE_WAIT_QUEUE_HEAD(obd_zombie_waitq); -static pid_t obd_zombie_pid; - -enum { - OBD_ZOMBIE_STOP = 0x0001, -}; - -/** - * check for work for kill zombie import/export thread. - */ -static int obd_zombie_impexp_check(void *arg) -{ - int rc; - - spin_lock(&obd_zombie_impexp_lock); - rc = (zombies_count == 0) && - !test_bit(OBD_ZOMBIE_STOP, &obd_zombie_flags); - spin_unlock(&obd_zombie_impexp_lock); - - RETURN(rc); -} - /** * Add export to the obd_zombe thread and notify it. */ @@ -1931,12 +1855,8 @@ static void obd_zombie_export_add(struct obd_export *exp) { LASSERT(!list_empty(&exp->exp_obd_chain)); list_del_init(&exp->exp_obd_chain); spin_unlock(&exp->exp_obd->obd_dev_lock); - spin_lock(&obd_zombie_impexp_lock); - zombies_count++; - list_add(&exp->exp_obd_chain, &obd_zombie_exports); - spin_unlock(&obd_zombie_impexp_lock); - obd_zombie_impexp_notify(); + queue_work(zombie_wq, &exp->exp_zombie_work); } /** @@ -1944,40 +1864,8 @@ static void obd_zombie_export_add(struct obd_export *exp) { */ static void obd_zombie_import_add(struct obd_import *imp) { LASSERT(imp->imp_sec == NULL); - spin_lock(&obd_zombie_impexp_lock); - LASSERT(list_empty(&imp->imp_zombie_chain)); - zombies_count++; - list_add(&imp->imp_zombie_chain, &obd_zombie_imports); - spin_unlock(&obd_zombie_impexp_lock); - obd_zombie_impexp_notify(); -} - -/** - * notify import/export destroy thread about new zombie. - */ -static void obd_zombie_impexp_notify(void) -{ - /* - * Make sure obd_zomebie_impexp_thread get this notification. - * It is possible this signal only get by obd_zombie_barrier, and - * barrier gulps this notification and sleeps away and hangs ensues - */ - wake_up_all(&obd_zombie_waitq); -} - -/** - * check whether obd_zombie is idle - */ -static int obd_zombie_is_idle(void) -{ - int rc; - - LASSERT(!test_bit(OBD_ZOMBIE_STOP, &obd_zombie_flags)); - spin_lock(&obd_zombie_impexp_lock); - rc = (zombies_count == 0); - spin_unlock(&obd_zombie_impexp_lock); - return rc; + queue_work(zombie_wq, &imp->imp_zombie_work); } /** @@ -1985,12 +1873,7 @@ static int obd_zombie_is_idle(void) */ void obd_zombie_barrier(void) { - struct l_wait_info lwi = { 0 }; - - if (obd_zombie_pid == current_pid()) - /* don't wait for myself */ - return; - l_wait_event(obd_zombie_waitq, obd_zombie_is_idle(), &lwi); + flush_workqueue(zombie_wq); } EXPORT_SYMBOL(obd_zombie_barrier); @@ -2066,57 +1949,23 @@ void obd_stale_export_adjust(struct obd_export *exp) EXPORT_SYMBOL(obd_stale_export_adjust); /** - * destroy zombie export/import thread. - */ -static int obd_zombie_impexp_thread(void *unused) -{ - unshare_fs_struct(); - complete(&obd_zombie_start); - - obd_zombie_pid = current_pid(); - - while (!test_bit(OBD_ZOMBIE_STOP, &obd_zombie_flags)) { - struct l_wait_info lwi = { 0 }; - - l_wait_event(obd_zombie_waitq, - !obd_zombie_impexp_check(NULL), &lwi); - obd_zombie_impexp_cull(); - - /* - * Notify obd_zombie_barrier callers that queues - * may be empty. - */ - wake_up(&obd_zombie_waitq); - } - - complete(&obd_zombie_stop); - - RETURN(0); -} - - -/** * start destroy zombie import/export thread */ int obd_zombie_impexp_init(void) { - struct task_struct *task; - - task = kthread_run(obd_zombie_impexp_thread, NULL, "obd_zombid"); - if (IS_ERR(task)) - RETURN(PTR_ERR(task)); + zombie_wq = alloc_workqueue("obd_zombid", 0, 0); + if (!zombie_wq) + return -ENOMEM; - wait_for_completion(&obd_zombie_start); - RETURN(0); + return 0; } + /** * stop destroy zombie import/export thread */ void obd_zombie_impexp_stop(void) { - set_bit(OBD_ZOMBIE_STOP, &obd_zombie_flags); - obd_zombie_impexp_notify(); - wait_for_completion(&obd_zombie_stop); + destroy_workqueue(zombie_wq); LASSERT(list_empty(&obd_stale_exports)); } @@ -2376,8 +2225,6 @@ int obd_set_max_mod_rpcs_in_flight(struct client_obd *cli, __u16 max) } EXPORT_SYMBOL(obd_set_max_mod_rpcs_in_flight); - -#define pct(a, b) (b ? a * 100 / b : 0) int obd_mod_rpc_stats_seq_show(struct client_obd *cli, struct seq_file *seq) { @@ -2403,7 +2250,7 @@ int obd_mod_rpc_stats_seq_show(struct client_obd *cli, for (i = 0; i < OBD_HIST_MAX; i++) { unsigned long mod = cli->cl_mod_rpcs_hist.oh_buckets[i]; mod_cum += mod; - seq_printf(seq, "%d:\t\t%10lu %3lu %3lu\n", + seq_printf(seq, "%d:\t\t%10lu %3u %3u\n", i, mod, pct(mod, mod_tot), pct(mod_cum, mod_tot)); if (mod_cum == mod_tot) @@ -2415,8 +2262,6 @@ int obd_mod_rpc_stats_seq_show(struct client_obd *cli, return 0; } EXPORT_SYMBOL(obd_mod_rpc_stats_seq_show); -#undef pct - /* The number of modify RPCs sent in parallel is limited * because the server has a finite number of slots per client to @@ -2458,7 +2303,7 @@ static inline bool obd_skip_mod_rpc_slot(const struct lookup_intent *it) if (it != NULL && (it->it_op == IT_GETATTR || it->it_op == IT_LOOKUP || it->it_op == IT_READDIR || - (it->it_op == IT_LAYOUT && !(it->it_flags & FMODE_WRITE)))) + (it->it_op == IT_LAYOUT && !(it->it_flags & MDS_FMODE_WRITE)))) return true; return false; } @@ -2512,8 +2357,9 @@ __u16 obd_get_mod_rpc_slot(struct client_obd *cli, __u32 opc, "opc %u, max %hu\n", cli->cl_import->imp_obd->obd_name, opc, max); - l_wait_event(cli->cl_mod_rpcs_waitq, - obd_mod_rpc_slot_avail(cli, close_req), &lwi); + l_wait_event_exclusive(cli->cl_mod_rpcs_waitq, + obd_mod_rpc_slot_avail(cli, close_req), + &lwi); } while (true); } EXPORT_SYMBOL(obd_get_mod_rpc_slot);