#include <lprocfs_status.h>
extern cfs_list_t obd_types;
-cfs_spinlock_t obd_types_lock;
+spinlock_t obd_types_lock;
cfs_mem_cache_t *obd_device_cachep;
cfs_mem_cache_t *obdo_cachep;
cfs_list_t obd_zombie_imports;
cfs_list_t obd_zombie_exports;
-cfs_spinlock_t obd_zombie_impexp_lock;
+spinlock_t obd_zombie_impexp_lock;
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);
struct obd_type *class_search_type(const char *name)
{
- cfs_list_t *tmp;
- struct obd_type *type;
+ cfs_list_t *tmp;
+ struct obd_type *type;
- cfs_spin_lock(&obd_types_lock);
- cfs_list_for_each(tmp, &obd_types) {
- type = cfs_list_entry(tmp, struct obd_type, typ_chain);
- if (strcmp(type->typ_name, name) == 0) {
- cfs_spin_unlock(&obd_types_lock);
- return type;
- }
- }
- cfs_spin_unlock(&obd_types_lock);
- return NULL;
+ spin_lock(&obd_types_lock);
+ cfs_list_for_each(tmp, &obd_types) {
+ type = cfs_list_entry(tmp, struct obd_type, typ_chain);
+ if (strcmp(type->typ_name, name) == 0) {
+ spin_unlock(&obd_types_lock);
+ return type;
+ }
+ }
+ spin_unlock(&obd_types_lock);
+ return NULL;
}
EXPORT_SYMBOL(class_search_type);
#ifdef HAVE_MODULE_LOADING_SUPPORT
if (!type) {
const char *modname = name;
+
+ if (strcmp(modname, "obdfilter") == 0)
+ modname = "ofd";
+
+ if (!strncmp(modname, LUSTRE_MDS_NAME, strlen(LUSTRE_MDS_NAME)))
+ modname = LUSTRE_MDT_NAME;
+
if (!cfs_request_module("%s", modname)) {
CDEBUG(D_INFO, "Loaded module '%s'\n", modname);
type = class_search_type(name);
}
#endif
if (type) {
- cfs_spin_lock(&type->obd_type_lock);
- type->typ_refcnt++;
- cfs_try_module_get(type->typ_dt_ops->o_owner);
- cfs_spin_unlock(&type->obd_type_lock);
- }
- return type;
+ spin_lock(&type->obd_type_lock);
+ type->typ_refcnt++;
+ cfs_try_module_get(type->typ_dt_ops->o_owner);
+ spin_unlock(&type->obd_type_lock);
+ }
+ return type;
}
EXPORT_SYMBOL(class_get_type);
void class_put_type(struct obd_type *type)
{
- LASSERT(type);
- cfs_spin_lock(&type->obd_type_lock);
- type->typ_refcnt--;
- cfs_module_put(type->typ_dt_ops->o_owner);
- cfs_spin_unlock(&type->obd_type_lock);
+ LASSERT(type);
+ spin_lock(&type->obd_type_lock);
+ type->typ_refcnt--;
+ cfs_module_put(type->typ_dt_ops->o_owner);
+ spin_unlock(&type->obd_type_lock);
}
EXPORT_SYMBOL(class_put_type);
if (md_ops)
*(type->typ_md_ops) = *md_ops;
strcpy(type->typ_name, name);
- cfs_spin_lock_init(&type->obd_type_lock);
+ spin_lock_init(&type->obd_type_lock);
#ifdef LPROCFS
type->typ_procroot = lprocfs_register(type->typ_name, proc_lustre_root,
GOTO (failed, rc);
}
- cfs_spin_lock(&obd_types_lock);
- cfs_list_add(&type->typ_chain, &obd_types);
- cfs_spin_unlock(&obd_types_lock);
+ spin_lock(&obd_types_lock);
+ cfs_list_add(&type->typ_chain, &obd_types);
+ spin_unlock(&obd_types_lock);
RETURN (0);
RETURN(-EBUSY);
}
- if (type->typ_procroot) {
- lprocfs_remove(&type->typ_procroot);
- }
+ /* 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
+ * module removes the entry */
+ lprocfs_try_remove_proc_entry(type->typ_name, proc_lustre_root);
if (type->typ_lu)
lu_device_type_fini(type->typ_lu);
- cfs_spin_lock(&obd_types_lock);
- cfs_list_del(&type->typ_chain);
- cfs_spin_unlock(&obd_types_lock);
+ spin_lock(&obd_types_lock);
+ cfs_list_del(&type->typ_chain);
+ spin_unlock(&obd_types_lock);
OBD_FREE(type->typ_name, strlen(name) + 1);
if (type->typ_dt_ops != NULL)
OBD_FREE_PTR(type->typ_dt_ops);
}
newdev = obd_device_alloc();
- if (newdev == NULL) {
- class_put_type(type);
- RETURN(ERR_PTR(-ENOMEM));
- }
+ if (newdev == NULL)
+ GOTO(out_type, result = ERR_PTR(-ENOMEM));
+
LASSERT(newdev->obd_magic == OBD_DEVICE_MAGIC);
- cfs_write_lock(&obd_dev_lock);
+ write_lock(&obd_dev_lock);
for (i = 0; i < class_devno_max(); i++) {
struct obd_device *obd = class_num2obd(i);
obd_devs[i] = result;
}
}
- cfs_write_unlock(&obd_dev_lock);
+ write_unlock(&obd_dev_lock);
if (result == NULL && i >= class_devno_max()) {
CERROR("all %u OBD devices used, increase MAX_OBD_DEVICES\n",
class_devno_max());
- RETURN(ERR_PTR(-EOVERFLOW));
+ GOTO(out, result = ERR_PTR(-EOVERFLOW));
}
- if (IS_ERR(result)) {
- obd_device_free(newdev);
- class_put_type(type);
- } else {
- CDEBUG(D_IOCTL, "Adding new device %s (%p)\n",
- result->obd_name, result);
- }
- RETURN(result);
+ if (IS_ERR(result))
+ GOTO(out, result);
+
+ CDEBUG(D_IOCTL, "Adding new device %s (%p)\n",
+ result->obd_name, result);
+
+ RETURN(result);
+out:
+ obd_device_free(newdev);
+out_type:
+ class_put_type(type);
+ return result;
}
void class_release_dev(struct obd_device *obd)
CDEBUG(D_INFO, "Release obd device %s at %d obd_type name =%s\n",
obd->obd_name, obd->obd_minor, obd->obd_type->typ_name);
- cfs_write_lock(&obd_dev_lock);
+ write_lock(&obd_dev_lock);
obd_devs[obd->obd_minor] = NULL;
- cfs_write_unlock(&obd_dev_lock);
+ write_unlock(&obd_dev_lock);
obd_device_free(obd);
class_put_type(obd_type);
if (!name)
return -1;
- cfs_read_lock(&obd_dev_lock);
+ read_lock(&obd_dev_lock);
for (i = 0; i < class_devno_max(); i++) {
struct obd_device *obd = class_num2obd(i);
out any references */
LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
if (obd->obd_attached) {
- cfs_read_unlock(&obd_dev_lock);
+ read_unlock(&obd_dev_lock);
return i;
}
break;
}
}
- cfs_read_unlock(&obd_dev_lock);
+ read_unlock(&obd_dev_lock);
return -1;
}
{
int i;
- cfs_read_lock(&obd_dev_lock);
+ read_lock(&obd_dev_lock);
for (i = 0; i < class_devno_max(); i++) {
struct obd_device *obd = class_num2obd(i);
if (obd && obd_uuid_equals(uuid, &obd->obd_uuid)) {
LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
- cfs_read_unlock(&obd_dev_lock);
+ read_unlock(&obd_dev_lock);
return i;
}
}
- cfs_read_unlock(&obd_dev_lock);
+ read_unlock(&obd_dev_lock);
return -1;
}
char *status;
int i;
- cfs_read_lock(&obd_dev_lock);
+ read_lock(&obd_dev_lock);
for (i = 0; i < class_devno_max(); i++) {
struct obd_device *obd = class_num2obd(i);
obd->obd_name, obd->obd_uuid.uuid,
cfs_atomic_read(&obd->obd_refcount));
}
- cfs_read_unlock(&obd_dev_lock);
+ read_unlock(&obd_dev_lock);
return;
}
{
int i;
- cfs_read_lock(&obd_dev_lock);
+ read_lock(&obd_dev_lock);
for (i = 0; i < class_devno_max(); i++) {
struct obd_device *obd = class_num2obd(i);
&obd->u.cli.cl_target_uuid) &&
((grp_uuid)? obd_uuid_equals(grp_uuid,
&obd->obd_uuid) : 1)) {
- cfs_read_unlock(&obd_dev_lock);
+ read_unlock(&obd_dev_lock);
return obd;
}
}
}
- cfs_read_unlock(&obd_dev_lock);
+ read_unlock(&obd_dev_lock);
return NULL;
}
else
return NULL;
- cfs_read_lock(&obd_dev_lock);
+ read_lock(&obd_dev_lock);
for (; i < class_devno_max(); i++) {
struct obd_device *obd = class_num2obd(i);
if (obd_uuid_equals(grp_uuid, &obd->obd_uuid)) {
if (next != NULL)
*next = i+1;
- cfs_read_unlock(&obd_dev_lock);
+ read_unlock(&obd_dev_lock);
return obd;
}
}
- cfs_read_unlock(&obd_dev_lock);
+ read_unlock(&obd_dev_lock);
return NULL;
}
LASSERT(namelen > 0);
- cfs_read_lock(&obd_dev_lock);
+ read_lock(&obd_dev_lock);
for (i = 0; i < class_devno_max(); i++) {
obd = class_num2obd(i);
continue;
class_incref(obd, __FUNCTION__, obd);
- cfs_read_unlock(&obd_dev_lock);
+ read_unlock(&obd_dev_lock);
rc2 = obd_set_info_async(NULL, obd->obd_self_export,
sizeof(KEY_SPTLRPC_CONF),
KEY_SPTLRPC_CONF, 0, NULL, NULL);
rc = rc ? rc : rc2;
class_decref(obd, __FUNCTION__, obd);
- cfs_read_lock(&obd_dev_lock);
+ read_lock(&obd_dev_lock);
}
- cfs_read_unlock(&obd_dev_lock);
+ read_unlock(&obd_dev_lock);
return rc;
}
EXPORT_SYMBOL(class_notify_sptlrpc_conf);
cfs_atomic_set(&export->exp_locks_count, 0);
#if LUSTRE_TRACKS_LOCK_EXP_REFS
CFS_INIT_LIST_HEAD(&export->exp_locks_list);
- cfs_spin_lock_init(&export->exp_locks_list_guard);
+ spin_lock_init(&export->exp_locks_list_guard);
#endif
- cfs_atomic_set(&export->exp_replay_count, 0);
- export->exp_obd = obd;
- CFS_INIT_LIST_HEAD(&export->exp_outstanding_replies);
- cfs_spin_lock_init(&export->exp_uncommitted_replies_lock);
- CFS_INIT_LIST_HEAD(&export->exp_uncommitted_replies);
- CFS_INIT_LIST_HEAD(&export->exp_req_replay_queue);
- CFS_INIT_LIST_HEAD(&export->exp_handle.h_link);
- CFS_INIT_LIST_HEAD(&export->exp_hp_rpcs);
+ cfs_atomic_set(&export->exp_replay_count, 0);
+ export->exp_obd = obd;
+ CFS_INIT_LIST_HEAD(&export->exp_outstanding_replies);
+ spin_lock_init(&export->exp_uncommitted_replies_lock);
+ CFS_INIT_LIST_HEAD(&export->exp_uncommitted_replies);
+ CFS_INIT_LIST_HEAD(&export->exp_req_replay_queue);
+ CFS_INIT_LIST_HEAD(&export->exp_handle.h_link);
+ CFS_INIT_LIST_HEAD(&export->exp_hp_rpcs);
class_handle_hash(&export->exp_handle, &export_handle_ops);
export->exp_last_request_time = cfs_time_current_sec();
- cfs_spin_lock_init(&export->exp_lock);
- cfs_spin_lock_init(&export->exp_rpc_lock);
- CFS_INIT_HLIST_NODE(&export->exp_uuid_hash);
- CFS_INIT_HLIST_NODE(&export->exp_nid_hash);
- cfs_spin_lock_init(&export->exp_bl_list_lock);
- CFS_INIT_LIST_HEAD(&export->exp_bl_list);
-
- export->exp_sp_peer = LUSTRE_SP_ANY;
- export->exp_flvr.sf_rpc = SPTLRPC_FLVR_INVALID;
- export->exp_client_uuid = *cluuid;
- obd_init_export(export);
-
- cfs_spin_lock(&obd->obd_dev_lock);
- /* shouldn't happen, but might race */
- if (obd->obd_stopping)
- GOTO(exit_unlock, rc = -ENODEV);
-
- hash = cfs_hash_getref(obd->obd_uuid_hash);
- if (hash == NULL)
- GOTO(exit_unlock, rc = -ENODEV);
- cfs_spin_unlock(&obd->obd_dev_lock);
+ spin_lock_init(&export->exp_lock);
+ spin_lock_init(&export->exp_rpc_lock);
+ CFS_INIT_HLIST_NODE(&export->exp_uuid_hash);
+ CFS_INIT_HLIST_NODE(&export->exp_nid_hash);
+ spin_lock_init(&export->exp_bl_list_lock);
+ CFS_INIT_LIST_HEAD(&export->exp_bl_list);
+
+ export->exp_sp_peer = LUSTRE_SP_ANY;
+ export->exp_flvr.sf_rpc = SPTLRPC_FLVR_INVALID;
+ export->exp_client_uuid = *cluuid;
+ obd_init_export(export);
+
+ spin_lock(&obd->obd_dev_lock);
+ /* shouldn't happen, but might race */
+ if (obd->obd_stopping)
+ GOTO(exit_unlock, rc = -ENODEV);
+
+ hash = cfs_hash_getref(obd->obd_uuid_hash);
+ if (hash == NULL)
+ GOTO(exit_unlock, rc = -ENODEV);
+ spin_unlock(&obd->obd_dev_lock);
if (!obd_uuid_equals(cluuid, &obd->obd_uuid)) {
rc = cfs_hash_add_unique(hash, cluuid, &export->exp_uuid_hash);
}
}
- cfs_spin_lock(&obd->obd_dev_lock);
+ spin_lock(&obd->obd_dev_lock);
if (obd->obd_stopping) {
cfs_hash_del(hash, cluuid, &export->exp_uuid_hash);
GOTO(exit_unlock, rc = -ENODEV);
cfs_list_add_tail(&export->exp_obd_chain_timed,
&export->exp_obd->obd_exports_timed);
export->exp_obd->obd_num_exports++;
- cfs_spin_unlock(&obd->obd_dev_lock);
- cfs_hash_putref(hash);
- RETURN(export);
+ spin_unlock(&obd->obd_dev_lock);
+ cfs_hash_putref(hash);
+ RETURN(export);
exit_unlock:
- cfs_spin_unlock(&obd->obd_dev_lock);
+ spin_unlock(&obd->obd_dev_lock);
exit_err:
if (hash)
cfs_hash_putref(hash);
void class_unlink_export(struct obd_export *exp)
{
- class_handle_unhash(&exp->exp_handle);
+ class_handle_unhash(&exp->exp_handle);
- cfs_spin_lock(&exp->exp_obd->obd_dev_lock);
- /* delete an uuid-export hashitem from hashtables */
- if (!cfs_hlist_unhashed(&exp->exp_uuid_hash))
- cfs_hash_del(exp->exp_obd->obd_uuid_hash,
- &exp->exp_client_uuid,
- &exp->exp_uuid_hash);
+ spin_lock(&exp->exp_obd->obd_dev_lock);
+ /* delete an uuid-export hashitem from hashtables */
+ if (!cfs_hlist_unhashed(&exp->exp_uuid_hash))
+ cfs_hash_del(exp->exp_obd->obd_uuid_hash,
+ &exp->exp_client_uuid,
+ &exp->exp_uuid_hash);
- cfs_list_move(&exp->exp_obd_chain, &exp->exp_obd->obd_unlinked_exports);
- cfs_list_del_init(&exp->exp_obd_chain_timed);
- exp->exp_obd->obd_num_exports--;
- cfs_spin_unlock(&exp->exp_obd->obd_dev_lock);
- class_export_put(exp);
+ cfs_list_move(&exp->exp_obd_chain, &exp->exp_obd->obd_unlinked_exports);
+ cfs_list_del_init(&exp->exp_obd_chain_timed);
+ exp->exp_obd->obd_num_exports--;
+ spin_unlock(&exp->exp_obd->obd_dev_lock);
+ class_export_put(exp);
}
EXPORT_SYMBOL(class_unlink_export);
CFS_INIT_LIST_HEAD(&imp->imp_replay_list);
CFS_INIT_LIST_HEAD(&imp->imp_sending_list);
CFS_INIT_LIST_HEAD(&imp->imp_delayed_list);
- cfs_spin_lock_init(&imp->imp_lock);
- imp->imp_last_success_conn = 0;
- imp->imp_state = LUSTRE_IMP_NEW;
- imp->imp_obd = class_incref(obd, "import", imp);
- cfs_mutex_init(&imp->imp_sec_mutex);
+ spin_lock_init(&imp->imp_lock);
+ imp->imp_last_success_conn = 0;
+ imp->imp_state = LUSTRE_IMP_NEW;
+ imp->imp_obd = class_incref(obd, "import", imp);
+ mutex_init(&imp->imp_sec_mutex);
cfs_waitq_init(&imp->imp_recovery_waitq);
cfs_atomic_set(&imp->imp_refcount, 2);
void class_destroy_import(struct obd_import *import)
{
- LASSERT(import != NULL);
- LASSERT(import != LP_POISON);
+ LASSERT(import != NULL);
+ LASSERT(import != LP_POISON);
- class_handle_unhash(&import->imp_handle);
+ class_handle_unhash(&import->imp_handle);
- cfs_spin_lock(&import->imp_lock);
- import->imp_generation++;
- cfs_spin_unlock(&import->imp_lock);
- class_import_put(import);
+ spin_lock(&import->imp_lock);
+ import->imp_generation++;
+ spin_unlock(&import->imp_lock);
+ class_import_put(import);
}
EXPORT_SYMBOL(class_destroy_import);
void __class_export_add_lock_ref(struct obd_export *exp, struct ldlm_lock *lock)
{
- cfs_spin_lock(&exp->exp_locks_list_guard);
+ spin_lock(&exp->exp_locks_list_guard);
LASSERT(lock->l_exp_refs_nr >= 0);
}
CDEBUG(D_INFO, "lock = %p, export = %p, refs = %u\n",
lock, exp, lock->l_exp_refs_nr);
- cfs_spin_unlock(&exp->exp_locks_list_guard);
+ spin_unlock(&exp->exp_locks_list_guard);
}
EXPORT_SYMBOL(__class_export_add_lock_ref);
void __class_export_del_lock_ref(struct obd_export *exp, struct ldlm_lock *lock)
{
- cfs_spin_lock(&exp->exp_locks_list_guard);
+ spin_lock(&exp->exp_locks_list_guard);
LASSERT(lock->l_exp_refs_nr > 0);
if (lock->l_exp_refs_target != exp) {
LCONSOLE_WARN("lock %p, "
}
CDEBUG(D_INFO, "lock = %p, export = %p, refs = %u\n",
lock, exp, lock->l_exp_refs_nr);
- cfs_spin_unlock(&exp->exp_locks_list_guard);
+ spin_unlock(&exp->exp_locks_list_guard);
}
EXPORT_SYMBOL(__class_export_del_lock_ref);
#endif
/* if export is involved in recovery then clean up related things */
void class_export_recovery_cleanup(struct obd_export *exp)
{
- struct obd_device *obd = exp->exp_obd;
+ struct obd_device *obd = exp->exp_obd;
+
+ spin_lock(&obd->obd_recovery_task_lock);
+ if (exp->exp_delayed)
+ obd->obd_delayed_clients--;
+ if (obd->obd_recovering) {
+ if (exp->exp_in_recovery) {
+ spin_lock(&exp->exp_lock);
+ exp->exp_in_recovery = 0;
+ spin_unlock(&exp->exp_lock);
+ LASSERT_ATOMIC_POS(&obd->obd_connected_clients);
+ cfs_atomic_dec(&obd->obd_connected_clients);
+ }
- cfs_spin_lock(&obd->obd_recovery_task_lock);
- if (exp->exp_delayed)
- obd->obd_delayed_clients--;
- if (obd->obd_recovering && exp->exp_in_recovery) {
- cfs_spin_lock(&exp->exp_lock);
- exp->exp_in_recovery = 0;
- cfs_spin_unlock(&exp->exp_lock);
- LASSERT_ATOMIC_POS(&obd->obd_connected_clients);
- cfs_atomic_dec(&obd->obd_connected_clients);
- }
- cfs_spin_unlock(&obd->obd_recovery_task_lock);
- /** Cleanup req replay fields */
- if (exp->exp_req_replay_needed) {
- cfs_spin_lock(&exp->exp_lock);
- exp->exp_req_replay_needed = 0;
- cfs_spin_unlock(&exp->exp_lock);
- LASSERT(cfs_atomic_read(&obd->obd_req_replay_clients));
- cfs_atomic_dec(&obd->obd_req_replay_clients);
- }
- /** Cleanup lock replay data */
- if (exp->exp_lock_replay_needed) {
- cfs_spin_lock(&exp->exp_lock);
- exp->exp_lock_replay_needed = 0;
- cfs_spin_unlock(&exp->exp_lock);
- LASSERT(cfs_atomic_read(&obd->obd_lock_replay_clients));
- cfs_atomic_dec(&obd->obd_lock_replay_clients);
- }
+ /* if called during recovery then should update
+ * obd_stale_clients counter,
+ * lightweight exports are not counted */
+ if (exp->exp_failed &&
+ (exp->exp_connect_flags & OBD_CONNECT_LIGHTWEIGHT) == 0)
+ exp->exp_obd->obd_stale_clients++;
+ }
+ spin_unlock(&obd->obd_recovery_task_lock);
+ /** Cleanup req replay fields */
+ if (exp->exp_req_replay_needed) {
+ spin_lock(&exp->exp_lock);
+ exp->exp_req_replay_needed = 0;
+ spin_unlock(&exp->exp_lock);
+ LASSERT(cfs_atomic_read(&obd->obd_req_replay_clients));
+ cfs_atomic_dec(&obd->obd_req_replay_clients);
+ }
+ /** Cleanup lock replay data */
+ if (exp->exp_lock_replay_needed) {
+ spin_lock(&exp->exp_lock);
+ exp->exp_lock_replay_needed = 0;
+ spin_unlock(&exp->exp_lock);
+ LASSERT(cfs_atomic_read(&obd->obd_lock_replay_clients));
+ cfs_atomic_dec(&obd->obd_lock_replay_clients);
+ }
}
/* This function removes 1-3 references from the export:
RETURN(-EINVAL);
}
- cfs_spin_lock(&export->exp_lock);
- already_disconnected = export->exp_disconnected;
- export->exp_disconnected = 1;
- cfs_spin_unlock(&export->exp_lock);
+ spin_lock(&export->exp_lock);
+ already_disconnected = export->exp_disconnected;
+ export->exp_disconnected = 1;
+ spin_unlock(&export->exp_lock);
/* class_cleanup(), abort_recovery(), and class_fail_export()
* all end up in here, and if any of them race we shouldn't
/* Return non-zero for a fully connected export */
int class_connected_export(struct obd_export *exp)
{
- if (exp) {
- int connected;
- cfs_spin_lock(&exp->exp_lock);
- connected = (exp->exp_conn_cnt > 0);
- cfs_spin_unlock(&exp->exp_lock);
- return connected;
- }
- return 0;
+ if (exp) {
+ int connected;
+ spin_lock(&exp->exp_lock);
+ connected = (exp->exp_conn_cnt > 0);
+ spin_unlock(&exp->exp_lock);
+ return connected;
+ }
+ return 0;
}
EXPORT_SYMBOL(class_connected_export);
/* need for safe call CDEBUG after obd_disconnect */
class_export_get(exp);
- cfs_spin_lock(&exp->exp_lock);
- exp->exp_flags = flags;
- cfs_spin_unlock(&exp->exp_lock);
+ spin_lock(&exp->exp_lock);
+ exp->exp_flags = flags;
+ spin_unlock(&exp->exp_lock);
if (obd_uuid_equals(&exp->exp_client_uuid,
&exp->exp_obd->obd_uuid)) {
void class_disconnect_exports(struct obd_device *obd)
{
- cfs_list_t work_list;
- ENTRY;
+ cfs_list_t work_list;
+ ENTRY;
- /* Move all of the exports from obd_exports to a work list, en masse. */
- CFS_INIT_LIST_HEAD(&work_list);
- cfs_spin_lock(&obd->obd_dev_lock);
- cfs_list_splice_init(&obd->obd_exports, &work_list);
- cfs_list_splice_init(&obd->obd_delayed_exports, &work_list);
- cfs_spin_unlock(&obd->obd_dev_lock);
+ /* Move all of the exports from obd_exports to a work list, en masse. */
+ CFS_INIT_LIST_HEAD(&work_list);
+ spin_lock(&obd->obd_dev_lock);
+ cfs_list_splice_init(&obd->obd_exports, &work_list);
+ cfs_list_splice_init(&obd->obd_delayed_exports, &work_list);
+ spin_unlock(&obd->obd_dev_lock);
if (!cfs_list_empty(&work_list)) {
CDEBUG(D_HA, "OBD device %d (%p) has exports, "
ENTRY;
CFS_INIT_LIST_HEAD(&work_list);
- cfs_spin_lock(&obd->obd_dev_lock);
+ spin_lock(&obd->obd_dev_lock);
cfs_list_for_each_entry_safe(exp, n, &obd->obd_exports,
exp_obd_chain) {
/* don't count self-export as client */
&exp->exp_obd->obd_uuid))
continue;
- cfs_spin_lock(&exp->exp_lock);
- if (test_export(exp)) {
- cfs_spin_unlock(&exp->exp_lock);
+ /* don't evict clients which have no slot in last_rcvd
+ * (e.g. lightweight connection) */
+ if (exp->exp_target_data.ted_lr_idx == -1)
+ continue;
+
+ spin_lock(&exp->exp_lock);
+ if (exp->exp_failed || test_export(exp)) {
+ spin_unlock(&exp->exp_lock);
continue;
}
exp->exp_failed = 1;
- cfs_spin_unlock(&exp->exp_lock);
+ spin_unlock(&exp->exp_lock);
cfs_list_move(&exp->exp_obd_chain, &work_list);
evicted++;
libcfs_nid2str(exp->exp_connection->c_peer.nid));
print_export_data(exp, "EVICTING", 0);
}
- cfs_spin_unlock(&obd->obd_dev_lock);
+ spin_unlock(&obd->obd_dev_lock);
- if (evicted) {
- LCONSOLE_WARN("%s: disconnecting %d stale clients\n",
- obd->obd_name, evicted);
- obd->obd_stale_clients += evicted;
- }
- class_disconnect_export_list(&work_list, exp_flags_from_obd(obd) |
- OBD_OPT_ABORT_RECOV);
- EXIT;
+ if (evicted)
+ LCONSOLE_WARN("%s: disconnecting %d stale clients\n",
+ obd->obd_name, evicted);
+
+ class_disconnect_export_list(&work_list, exp_flags_from_obd(obd) |
+ OBD_OPT_ABORT_RECOV);
+ EXIT;
}
EXPORT_SYMBOL(class_disconnect_stale_exports);
void class_fail_export(struct obd_export *exp)
{
- int rc, already_failed;
+ int rc, already_failed;
- cfs_spin_lock(&exp->exp_lock);
- already_failed = exp->exp_failed;
- exp->exp_failed = 1;
- cfs_spin_unlock(&exp->exp_lock);
+ spin_lock(&exp->exp_lock);
+ already_failed = exp->exp_failed;
+ exp->exp_failed = 1;
+ spin_unlock(&exp->exp_lock);
if (already_failed) {
CDEBUG(D_HA, "disconnecting dead export %p/%s; skipping\n",
int obd_export_evict_by_nid(struct obd_device *obd, const char *nid)
{
- struct obd_export *doomed_exp = NULL;
- int exports_evicted = 0;
-
- lnet_nid_t nid_key = libcfs_str2nid((char *)nid);
-
- do {
- doomed_exp = cfs_hash_lookup(obd->obd_nid_hash, &nid_key);
+ cfs_hash_t *nid_hash;
+ struct obd_export *doomed_exp = NULL;
+ int exports_evicted = 0;
+
+ lnet_nid_t nid_key = libcfs_str2nid((char *)nid);
+
+ spin_lock(&obd->obd_dev_lock);
+ /* umount has run already, so evict thread should leave
+ * its task to umount thread now */
+ if (obd->obd_stopping) {
+ spin_unlock(&obd->obd_dev_lock);
+ return exports_evicted;
+ }
+ nid_hash = obd->obd_nid_hash;
+ cfs_hash_getref(nid_hash);
+ spin_unlock(&obd->obd_dev_lock);
+
+ do {
+ doomed_exp = cfs_hash_lookup(nid_hash, &nid_key);
if (doomed_exp == NULL)
break;
class_export_put(doomed_exp);
} while (1);
+ cfs_hash_putref(nid_hash);
+
if (!exports_evicted)
CDEBUG(D_HA,"%s: can't disconnect NID '%s': no exports found\n",
obd->obd_name, nid);
int obd_export_evict_by_uuid(struct obd_device *obd, const char *uuid)
{
- struct obd_export *doomed_exp = NULL;
- struct obd_uuid doomed_uuid;
- int exports_evicted = 0;
+ cfs_hash_t *uuid_hash;
+ struct obd_export *doomed_exp = NULL;
+ struct obd_uuid doomed_uuid;
+ int exports_evicted = 0;
+
+ spin_lock(&obd->obd_dev_lock);
+ if (obd->obd_stopping) {
+ spin_unlock(&obd->obd_dev_lock);
+ return exports_evicted;
+ }
+ uuid_hash = obd->obd_uuid_hash;
+ cfs_hash_getref(uuid_hash);
+ spin_unlock(&obd->obd_dev_lock);
obd_str2uuid(&doomed_uuid, uuid);
if (obd_uuid_equals(&doomed_uuid, &obd->obd_uuid)) {
CERROR("%s: can't evict myself\n", obd->obd_name);
+ cfs_hash_putref(uuid_hash);
return exports_evicted;
}
- doomed_exp = cfs_hash_lookup(obd->obd_uuid_hash, &doomed_uuid);
+ doomed_exp = cfs_hash_lookup(uuid_hash, &doomed_uuid);
if (doomed_exp == NULL) {
CERROR("%s: can't disconnect %s: no exports found\n",
class_export_put(doomed_exp);
exports_evicted++;
}
+ cfs_hash_putref(uuid_hash);
return exports_evicted;
}
#endif
static void print_export_data(struct obd_export *exp, const char *status,
- int locks)
-{
- struct ptlrpc_reply_state *rs;
- struct ptlrpc_reply_state *first_reply = NULL;
- int nreplies = 0;
-
- cfs_spin_lock(&exp->exp_lock);
- cfs_list_for_each_entry(rs, &exp->exp_outstanding_replies,
- rs_exp_list) {
- if (nreplies == 0)
- first_reply = rs;
- nreplies++;
- }
- cfs_spin_unlock(&exp->exp_lock);
+ int locks)
+{
+ struct ptlrpc_reply_state *rs;
+ struct ptlrpc_reply_state *first_reply = NULL;
+ int nreplies = 0;
+
+ spin_lock(&exp->exp_lock);
+ cfs_list_for_each_entry(rs, &exp->exp_outstanding_replies,
+ rs_exp_list) {
+ if (nreplies == 0)
+ first_reply = rs;
+ nreplies++;
+ }
+ spin_unlock(&exp->exp_lock);
CDEBUG(D_HA, "%s: %s %p %s %s %d (%d %d %d) %d %d %d %d: %p %s "LPU64"\n",
exp->exp_obd->obd_name, status, exp, exp->exp_client_uuid.uuid,
{
struct obd_export *exp;
- cfs_spin_lock(&obd->obd_dev_lock);
- cfs_list_for_each_entry(exp, &obd->obd_exports, exp_obd_chain)
- print_export_data(exp, "ACTIVE", locks);
- cfs_list_for_each_entry(exp, &obd->obd_unlinked_exports, exp_obd_chain)
- print_export_data(exp, "UNLINKED", locks);
- cfs_list_for_each_entry(exp, &obd->obd_delayed_exports, exp_obd_chain)
- print_export_data(exp, "DELAYED", locks);
- cfs_spin_unlock(&obd->obd_dev_lock);
- cfs_spin_lock(&obd_zombie_impexp_lock);
- cfs_list_for_each_entry(exp, &obd_zombie_exports, exp_obd_chain)
- print_export_data(exp, "ZOMBIE", locks);
- cfs_spin_unlock(&obd_zombie_impexp_lock);
+ spin_lock(&obd->obd_dev_lock);
+ cfs_list_for_each_entry(exp, &obd->obd_exports, exp_obd_chain)
+ print_export_data(exp, "ACTIVE", locks);
+ cfs_list_for_each_entry(exp, &obd->obd_unlinked_exports, exp_obd_chain)
+ print_export_data(exp, "UNLINKED", locks);
+ cfs_list_for_each_entry(exp, &obd->obd_delayed_exports, exp_obd_chain)
+ print_export_data(exp, "DELAYED", locks);
+ spin_unlock(&obd->obd_dev_lock);
+ spin_lock(&obd_zombie_impexp_lock);
+ cfs_list_for_each_entry(exp, &obd_zombie_exports, exp_obd_chain)
+ print_export_data(exp, "ZOMBIE", locks);
+ spin_unlock(&obd_zombie_impexp_lock);
}
EXPORT_SYMBOL(dump_exports);
void obd_exports_barrier(struct obd_device *obd)
{
- int waited = 2;
- LASSERT(cfs_list_empty(&obd->obd_exports));
- cfs_spin_lock(&obd->obd_dev_lock);
- while (!cfs_list_empty(&obd->obd_unlinked_exports)) {
- cfs_spin_unlock(&obd->obd_dev_lock);
+ int waited = 2;
+ LASSERT(cfs_list_empty(&obd->obd_exports));
+ spin_lock(&obd->obd_dev_lock);
+ while (!cfs_list_empty(&obd->obd_unlinked_exports)) {
+ spin_unlock(&obd->obd_dev_lock);
cfs_schedule_timeout_and_set_state(CFS_TASK_UNINT,
cfs_time_seconds(waited));
if (waited > 5 && IS_PO2(waited)) {
dump_exports(obd, 1);
}
waited *= 2;
- cfs_spin_lock(&obd->obd_dev_lock);
- }
- cfs_spin_unlock(&obd->obd_dev_lock);
+ spin_lock(&obd->obd_dev_lock);
+ }
+ spin_unlock(&obd->obd_dev_lock);
}
EXPORT_SYMBOL(obd_exports_barrier);
*/
void obd_zombie_impexp_cull(void)
{
- struct obd_import *import;
- struct obd_export *export;
- ENTRY;
+ struct obd_import *import;
+ struct obd_export *export;
+ ENTRY;
- do {
- cfs_spin_lock(&obd_zombie_impexp_lock);
+ do {
+ spin_lock(&obd_zombie_impexp_lock);
import = NULL;
if (!cfs_list_empty(&obd_zombie_imports)) {
cfs_list_del_init(&export->exp_obd_chain);
}
- cfs_spin_unlock(&obd_zombie_impexp_lock);
+ spin_unlock(&obd_zombie_impexp_lock);
- if (import != NULL) {
- class_import_destroy(import);
- cfs_spin_lock(&obd_zombie_impexp_lock);
- zombies_count--;
- cfs_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);
- cfs_spin_lock(&obd_zombie_impexp_lock);
- zombies_count--;
- cfs_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);
+ }
- cfs_cond_resched();
- } while (import != NULL || export != NULL);
- EXIT;
+ cfs_cond_resched();
+ } while (import != NULL || export != NULL);
+ EXIT;
}
-static cfs_completion_t obd_zombie_start;
-static cfs_completion_t obd_zombie_stop;
-static unsigned long obd_zombie_flags;
-static cfs_waitq_t obd_zombie_waitq;
-static pid_t obd_zombie_pid;
+static struct completion obd_zombie_start;
+static struct completion obd_zombie_stop;
+static unsigned long obd_zombie_flags;
+static cfs_waitq_t obd_zombie_waitq;
+static pid_t obd_zombie_pid;
enum {
- OBD_ZOMBIE_STOP = 1 << 1
+ OBD_ZOMBIE_STOP = 0x0001,
};
/**
*/
static int obd_zombie_impexp_check(void *arg)
{
- int rc;
+ int rc;
- cfs_spin_lock(&obd_zombie_impexp_lock);
- rc = (zombies_count == 0) &&
- !cfs_test_bit(OBD_ZOMBIE_STOP, &obd_zombie_flags);
- cfs_spin_unlock(&obd_zombie_impexp_lock);
+ 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);
+ RETURN(rc);
}
/**
* Add export to the obd_zombe thread and notify it.
*/
static void obd_zombie_export_add(struct obd_export *exp) {
- cfs_spin_lock(&exp->exp_obd->obd_dev_lock);
- LASSERT(!cfs_list_empty(&exp->exp_obd_chain));
- cfs_list_del_init(&exp->exp_obd_chain);
- cfs_spin_unlock(&exp->exp_obd->obd_dev_lock);
- cfs_spin_lock(&obd_zombie_impexp_lock);
- zombies_count++;
- cfs_list_add(&exp->exp_obd_chain, &obd_zombie_exports);
- cfs_spin_unlock(&obd_zombie_impexp_lock);
+ spin_lock(&exp->exp_obd->obd_dev_lock);
+ LASSERT(!cfs_list_empty(&exp->exp_obd_chain));
+ cfs_list_del_init(&exp->exp_obd_chain);
+ spin_unlock(&exp->exp_obd->obd_dev_lock);
+ spin_lock(&obd_zombie_impexp_lock);
+ zombies_count++;
+ cfs_list_add(&exp->exp_obd_chain, &obd_zombie_exports);
+ spin_unlock(&obd_zombie_impexp_lock);
- obd_zombie_impexp_notify();
+ obd_zombie_impexp_notify();
}
/**
* Add import to the obd_zombe thread and notify it.
*/
static void obd_zombie_import_add(struct obd_import *imp) {
- LASSERT(imp->imp_sec == NULL);
- LASSERT(imp->imp_rq_pool == NULL);
- cfs_spin_lock(&obd_zombie_impexp_lock);
- LASSERT(cfs_list_empty(&imp->imp_zombie_chain));
- zombies_count++;
- cfs_list_add(&imp->imp_zombie_chain, &obd_zombie_imports);
- cfs_spin_unlock(&obd_zombie_impexp_lock);
+ LASSERT(imp->imp_sec == NULL);
+ LASSERT(imp->imp_rq_pool == NULL);
+ spin_lock(&obd_zombie_impexp_lock);
+ LASSERT(cfs_list_empty(&imp->imp_zombie_chain));
+ zombies_count++;
+ cfs_list_add(&imp->imp_zombie_chain, &obd_zombie_imports);
+ spin_unlock(&obd_zombie_impexp_lock);
- obd_zombie_impexp_notify();
+ obd_zombie_impexp_notify();
}
/**
*/
static int obd_zombie_is_idle(void)
{
- int rc;
+ int rc;
- LASSERT(!cfs_test_bit(OBD_ZOMBIE_STOP, &obd_zombie_flags));
- cfs_spin_lock(&obd_zombie_impexp_lock);
- rc = (zombies_count == 0);
- cfs_spin_unlock(&obd_zombie_impexp_lock);
- return 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;
}
/**
*/
static int obd_zombie_impexp_thread(void *unused)
{
- int rc;
+ int rc;
- if ((rc = cfs_daemonize_ctxt("obd_zombid"))) {
- cfs_complete(&obd_zombie_start);
- RETURN(rc);
- }
+ rc = cfs_daemonize_ctxt("obd_zombid");
+ if (rc != 0) {
+ complete(&obd_zombie_start);
+ RETURN(rc);
+ }
- cfs_complete(&obd_zombie_start);
+ complete(&obd_zombie_start);
- obd_zombie_pid = cfs_curproc_pid();
+ obd_zombie_pid = cfs_curproc_pid();
- while(!cfs_test_bit(OBD_ZOMBIE_STOP, &obd_zombie_flags)) {
+ while (!test_bit(OBD_ZOMBIE_STOP, &obd_zombie_flags)) {
struct l_wait_info lwi = { 0 };
l_wait_event(obd_zombie_waitq,
cfs_waitq_signal(&obd_zombie_waitq);
}
- cfs_complete(&obd_zombie_stop);
+ complete(&obd_zombie_stop);
- RETURN(0);
+ RETURN(0);
}
#else /* ! KERNEL */
*/
int obd_zombie_impexp_init(void)
{
- int rc;
+ int rc;
- CFS_INIT_LIST_HEAD(&obd_zombie_imports);
- CFS_INIT_LIST_HEAD(&obd_zombie_exports);
- cfs_spin_lock_init(&obd_zombie_impexp_lock);
- cfs_init_completion(&obd_zombie_start);
- cfs_init_completion(&obd_zombie_stop);
- cfs_waitq_init(&obd_zombie_waitq);
- obd_zombie_pid = 0;
+ CFS_INIT_LIST_HEAD(&obd_zombie_imports);
+ CFS_INIT_LIST_HEAD(&obd_zombie_exports);
+ spin_lock_init(&obd_zombie_impexp_lock);
+ init_completion(&obd_zombie_start);
+ init_completion(&obd_zombie_stop);
+ cfs_waitq_init(&obd_zombie_waitq);
+ obd_zombie_pid = 0;
#ifdef __KERNEL__
- rc = cfs_create_thread(obd_zombie_impexp_thread, NULL, 0);
- if (rc < 0)
- RETURN(rc);
+ rc = cfs_create_thread(obd_zombie_impexp_thread, NULL, 0);
+ if (rc < 0)
+ RETURN(rc);
- cfs_wait_for_completion(&obd_zombie_start);
+ wait_for_completion(&obd_zombie_start);
#else
obd_zombie_impexp_work_cb =
*/
void obd_zombie_impexp_stop(void)
{
- cfs_set_bit(OBD_ZOMBIE_STOP, &obd_zombie_flags);
+ set_bit(OBD_ZOMBIE_STOP, &obd_zombie_flags);
obd_zombie_impexp_notify();
#ifdef __KERNEL__
- cfs_wait_for_completion(&obd_zombie_stop);
+ wait_for_completion(&obd_zombie_stop);
#else
liblustre_deregister_wait_callback(obd_zombie_impexp_work_cb);
liblustre_deregister_idle_callback(obd_zombie_impexp_idle_cb);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff