struct list_head obd_zombie_exports;
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);
int (*ptlrpc_put_connection_superhack)(struct ptlrpc_connection *c);
{
struct obd_device *obd;
- OBD_SLAB_ALLOC_PTR(obd, obd_device_cachep);
+ OBD_SLAB_ALLOC_PTR_GFP(obd, obd_device_cachep, CFS_ALLOC_IO);
if (obd != NULL) {
obd->obd_magic = OBD_DEVICE_MAGIC;
}
return NULL;
}
-struct obd_device *class_find_client_notype(struct obd_uuid *tgt_uuid,
- struct obd_uuid *grp_uuid)
-{
- struct obd_device *obd;
-
- obd = class_find_client_obd(tgt_uuid, LUSTRE_MDC_NAME, NULL);
- if (!obd)
- obd = class_find_client_obd(tgt_uuid, LUSTRE_OSC_NAME,
- grp_uuid);
- return obd;
-}
-
/* Iterate the obd_device list looking devices have grp_uuid. Start
searching at *next, and if a device is found, the next index to look
at is saved in *next. If next is NULL, then the first matching device
return NULL;
}
+/**
+ * to notify sptlrpc log for @fsname has changed, let every relevant OBD
+ * adjust sptlrpc settings accordingly.
+ */
+int class_notify_sptlrpc_conf(const char *fsname, int namelen)
+{
+ struct obd_device *obd;
+ const char *type;
+ int i, rc = 0, rc2;
+
+ LASSERT(namelen > 0);
+
+ spin_lock(&obd_dev_lock);
+ for (i = 0; i < class_devno_max(); i++) {
+ obd = class_num2obd(i);
+
+ if (obd == NULL || obd->obd_set_up == 0 || obd->obd_stopping)
+ continue;
+
+ /* only notify mdc, osc, mdt, ost */
+ type = obd->obd_type->typ_name;
+ if (strcmp(type, LUSTRE_MDC_NAME) != 0 &&
+ strcmp(type, LUSTRE_OSC_NAME) != 0 &&
+ strcmp(type, LUSTRE_MDT_NAME) != 0 &&
+ strcmp(type, LUSTRE_OST_NAME) != 0)
+ continue;
+
+ if (strncmp(obd->obd_name, fsname, namelen))
+ continue;
+
+ class_incref(obd, __FUNCTION__, obd);
+ spin_unlock(&obd_dev_lock);
+ rc2 = obd_set_info_async(obd->obd_self_export,
+ sizeof(KEY_SPTLRPC_CONF),
+ KEY_SPTLRPC_CONF, 0, NULL, NULL);
+ rc = rc ? rc : rc2;
+ class_decref(obd, __FUNCTION__, obd);
+ spin_lock(&obd_dev_lock);
+ }
+ spin_unlock(&obd_dev_lock);
+ return rc;
+}
+EXPORT_SYMBOL(class_notify_sptlrpc_conf);
void obd_cleanup_caches(void)
{
}
/* Export management functions */
+static void class_export_destroy(struct obd_export *exp)
+{
+ struct obd_device *obd = exp->exp_obd;
+ ENTRY;
+
+ LASSERT (atomic_read(&exp->exp_refcount) == 0);
+
+ CDEBUG(D_IOCTL, "destroying export %p/%s for %s\n", exp,
+ exp->exp_client_uuid.uuid, obd->obd_name);
+
+ LASSERT(obd != NULL);
+
+ /* "Local" exports (lctl, LOV->{mdc,osc}) have no connection. */
+ if (exp->exp_connection)
+ ptlrpc_put_connection_superhack(exp->exp_connection);
+
+ LASSERT(list_empty(&exp->exp_outstanding_replies));
+ LASSERT(list_empty(&exp->exp_uncommitted_replies));
+ LASSERT(list_empty(&exp->exp_req_replay_queue));
+ LASSERT(list_empty(&exp->exp_queued_rpc));
+ obd_destroy_export(exp);
+ class_decref(obd, "export", exp);
+
+ OBD_FREE_RCU(exp, sizeof(*exp), &exp->exp_handle);
+ EXIT;
+}
+
static void export_handle_addref(void *export)
{
class_export_get(export);
LASSERT(atomic_read(&exp->exp_refcount) < 0x5a5a5a);
if (atomic_dec_and_test(&exp->exp_refcount)) {
- LASSERT (list_empty(&exp->exp_obd_chain));
-
CDEBUG(D_IOCTL, "final put %p/%s\n",
exp, exp->exp_client_uuid.uuid);
-
- spin_lock(&obd_zombie_impexp_lock);
- list_add(&exp->exp_obd_chain, &obd_zombie_exports);
- spin_unlock(&obd_zombie_impexp_lock);
-
- if (obd_zombie_impexp_notify != NULL)
- obd_zombie_impexp_notify();
+ obd_zombie_export_add(exp);
}
}
EXPORT_SYMBOL(class_export_put);
-static void class_export_destroy(struct obd_export *exp)
-{
- struct obd_device *obd = exp->exp_obd;
- ENTRY;
-
- LASSERT (atomic_read(&exp->exp_refcount) == 0);
-
- CDEBUG(D_IOCTL, "destroying export %p/%s for %s\n", exp,
- exp->exp_client_uuid.uuid, obd->obd_name);
-
- LASSERT(obd != NULL);
-
- /* "Local" exports (lctl, LOV->{mdc,osc}) have no connection. */
- if (exp->exp_connection)
- ptlrpc_put_connection_superhack(exp->exp_connection);
-
- LASSERT(list_empty(&exp->exp_outstanding_replies));
- LASSERT(list_empty(&exp->exp_req_replay_queue));
- obd_destroy_export(exp);
- class_decref(obd, "export", exp);
-
- OBD_FREE_RCU(exp, sizeof(*exp), &exp->exp_handle);
- EXIT;
-}
-
/* 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. */
atomic_set(&export->exp_rpc_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_queued_rpc);
class_handle_hash(&export->exp_handle, export_handle_addref);
export->exp_last_request_time = cfs_time_current_sec();
spin_lock_init(&export->exp_lock);
exp->exp_obd->obd_num_exports--;
spin_unlock(&exp->exp_obd->obd_dev_lock);
+ /* Keep these counter valid always */
+ spin_lock_bh(&exp->exp_obd->obd_processing_task_lock);
+ if (exp->exp_delayed)
+ exp->exp_obd->obd_delayed_clients--;
+ else if (exp->exp_in_recovery)
+ exp->exp_obd->obd_recoverable_clients--;
+ else if (exp->exp_obd->obd_recovering)
+ exp->exp_obd->obd_max_recoverable_clients--;
+ spin_unlock_bh(&exp->exp_obd->obd_processing_task_lock);
class_export_put(exp);
}
EXPORT_SYMBOL(class_unlink_export);
/* Import management functions */
+void class_import_destroy(struct obd_import *imp)
+{
+ ENTRY;
+
+ CDEBUG(D_IOCTL, "destroying import %p for %s\n", imp,
+ imp->imp_obd->obd_name);
+
+ LASSERT(atomic_read(&imp->imp_refcount) == 0);
+
+ ptlrpc_put_connection_superhack(imp->imp_connection);
+
+ while (!list_empty(&imp->imp_conn_list)) {
+ struct obd_import_conn *imp_conn;
+
+ imp_conn = list_entry(imp->imp_conn_list.next,
+ struct obd_import_conn, oic_item);
+ list_del_init(&imp_conn->oic_item);
+ ptlrpc_put_connection_superhack(imp_conn->oic_conn);
+ OBD_FREE(imp_conn, sizeof(*imp_conn));
+ }
+
+ 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);
LASSERT(atomic_read(&import->imp_refcount) >= 0);
LASSERT(atomic_read(&import->imp_refcount) < 0x5a5a5a);
atomic_inc(&import->imp_refcount);
- CDEBUG(D_INFO, "import %p refcount=%d\n", import,
- atomic_read(&import->imp_refcount));
+ CDEBUG(D_INFO, "import %p refcount=%d obd=%s\n", import,
+ atomic_read(&import->imp_refcount),
+ import->imp_obd->obd_name);
return import;
}
EXPORT_SYMBOL(class_import_get);
-void class_import_put(struct obd_import *import)
+void class_import_put(struct obd_import *imp)
{
ENTRY;
- LASSERT(atomic_read(&import->imp_refcount) > 0);
- LASSERT(atomic_read(&import->imp_refcount) < 0x5a5a5a);
- LASSERT(list_empty(&import->imp_zombie_chain));
-
- CDEBUG(D_INFO, "import %p refcount=%d\n", import,
- atomic_read(&import->imp_refcount) - 1);
-
- if (atomic_dec_and_test(&import->imp_refcount)) {
-
- CDEBUG(D_INFO, "final put import %p\n", import);
+ LASSERT(atomic_read(&imp->imp_refcount) > 0);
+ LASSERT(atomic_read(&imp->imp_refcount) < 0x5a5a5a);
+ LASSERT(list_empty(&imp->imp_zombie_chain));
- spin_lock(&obd_zombie_impexp_lock);
- list_add(&import->imp_zombie_chain, &obd_zombie_imports);
- spin_unlock(&obd_zombie_impexp_lock);
+ CDEBUG(D_INFO, "import %p refcount=%d obd=%s\n", imp,
+ atomic_read(&imp->imp_refcount) - 1,
+ imp->imp_obd->obd_name);
- if (obd_zombie_impexp_notify != NULL)
- obd_zombie_impexp_notify();
+ if (atomic_dec_and_test(&imp->imp_refcount)) {
+ CDEBUG(D_INFO, "final put import %p\n", imp);
+ obd_zombie_import_add(imp);
}
EXIT;
}
EXPORT_SYMBOL(class_import_put);
-void class_import_destroy(struct obd_import *import)
-{
- ENTRY;
-
- CDEBUG(D_IOCTL, "destroying import %p for %s\n", import,
- import->imp_obd->obd_name);
-
- LASSERT(atomic_read(&import->imp_refcount) == 0);
-
- ptlrpc_put_connection_superhack(import->imp_connection);
-
- while (!list_empty(&import->imp_conn_list)) {
- struct obd_import_conn *imp_conn;
-
- imp_conn = list_entry(import->imp_conn_list.next,
- struct obd_import_conn, oic_item);
- list_del(&imp_conn->oic_item);
- ptlrpc_put_connection_superhack(imp_conn->oic_conn);
- OBD_FREE(imp_conn, sizeof(*imp_conn));
- }
-
- LASSERT(import->imp_sec == NULL);
- class_decref(import->imp_obd, "import", import);
- OBD_FREE_RCU(import, sizeof(*import), &import->imp_handle);
- EXIT;
-}
-
static void init_imp_at(struct imp_at *at) {
int i;
at_init(&at->iat_net_latency, 0, 0);
cfs_waitq_init(&imp->imp_recovery_waitq);
atomic_set(&imp->imp_refcount, 2);
+ atomic_set(&imp->imp_unregistering, 0);
atomic_set(&imp->imp_inflight, 0);
atomic_set(&imp->imp_replay_inflight, 0);
atomic_set(&imp->imp_inval_count, 0);
spin_unlock_bh(&obd->obd_processing_task_lock);
}
-/* This function removes two references from the export: one for the
- * hash entry and one for the export pointer passed in. The export
- * pointer passed to this function is destroyed should not be used
- * again. */
+/* This function removes 1-3 references from the export:
+ * 1 - for export pointer passed
+ * and if disconnect really need
+ * 2 - removing from hash
+ * 3 - in client_unlink_export
+ * The export pointer passed to this function can destroyed */
int class_disconnect(struct obd_export *export)
{
int already_disconnected;
spin_lock(&export->exp_lock);
already_disconnected = export->exp_disconnected;
export->exp_disconnected = 1;
-
- if (!hlist_unhashed(&export->exp_nid_hash))
- lustre_hash_del(export->exp_obd->obd_nid_hash,
- &export->exp_connection->c_peer.nid,
- &export->exp_nid_hash);
-
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
* call extra class_export_puts(). */
- if (already_disconnected)
- RETURN(0);
+ if (already_disconnected) {
+ LASSERT(hlist_unhashed(&export->exp_nid_hash));
+ GOTO(no_disconn, already_disconnected);
+ }
CDEBUG(D_IOCTL, "disconnect: cookie "LPX64"\n",
export->exp_handle.h_cookie);
+ if (!hlist_unhashed(&export->exp_nid_hash))
+ lustre_hash_del(export->exp_obd->obd_nid_hash,
+ &export->exp_connection->c_peer.nid,
+ &export->exp_nid_hash);
+
class_export_recovery_cleanup(export);
class_unlink_export(export);
+no_disconn:
class_export_put(export);
RETURN(0);
}
-static void class_disconnect_export_list(struct list_head *list, int flags)
+static void class_disconnect_export_list(struct list_head *list,
+ enum obd_option flags)
{
int rc;
- struct lustre_handle fake_conn;
- struct obd_export *fake_exp, *exp;
+ struct obd_export *exp;
ENTRY;
/* It's possible that an export may disconnect itself, but
* nothing else will be added to this list. */
while (!list_empty(list)) {
exp = list_entry(list->next, struct obd_export, exp_obd_chain);
+ /* need for safe call CDEBUG after obd_disconnect */
class_export_get(exp);
spin_lock(&exp->exp_lock);
continue;
}
- fake_conn.cookie = exp->exp_handle.h_cookie;
- fake_exp = class_conn2export(&fake_conn);
- if (!fake_exp) {
- class_export_put(exp);
- continue;
- }
-
- spin_lock(&fake_exp->exp_lock);
- fake_exp->exp_flags = flags;
- spin_unlock(&fake_exp->exp_lock);
-
+ class_export_get(exp);
CDEBUG(D_HA, "%s: disconnecting export at %s (%p), "
"last request at "CFS_TIME_T"\n",
exp->exp_obd->obd_name, obd_export_nid2str(exp),
exp, exp->exp_last_request_time);
- rc = obd_disconnect(fake_exp);
+ /* release one export reference anyway */
+ rc = obd_disconnect(exp);
+
+ CDEBUG(D_HA, "disconnected export at %s (%p): rc %d\n",
+ obd_export_nid2str(exp), exp, rc);
class_export_put(exp);
}
EXIT;
}
-static inline int get_exp_flags_from_obd(struct obd_device *obd)
-{
- return ((obd->obd_fail ? OBD_OPT_FAILOVER : 0) |
- (obd->obd_force ? OBD_OPT_FORCE : 0));
-}
-
void class_disconnect_exports(struct obd_device *obd)
{
struct list_head work_list;
ENTRY;
/* 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);
- list_add(&work_list, &obd->obd_exports);
- list_del_init(&obd->obd_exports);
+ list_splice_init(&obd->obd_exports, &work_list);
+ list_splice_init(&obd->obd_delayed_exports, &work_list);
spin_unlock(&obd->obd_dev_lock);
if (!list_empty(&work_list)) {
CDEBUG(D_HA, "OBD device %d (%p) has exports, "
"disconnecting them\n", obd->obd_minor, obd);
class_disconnect_export_list(&work_list,
- get_exp_flags_from_obd(obd));
+ exp_flags_from_obd(obd));
} else
CDEBUG(D_HA, "OBD device %d (%p) has no exports\n",
obd->obd_minor, obd);
/* Remove exports that have not completed recovery.
*/
-int class_disconnect_stale_exports(struct obd_device *obd,
- int (*test_export)(struct obd_export *))
+void class_disconnect_stale_exports(struct obd_device *obd,
+ int (*test_export)(struct obd_export *),
+ enum obd_option flags)
{
struct list_head work_list;
struct list_head *pos, *n;
struct obd_export *exp;
- int cnt = 0;
ENTRY;
CFS_INIT_LIST_HEAD(&work_list);
spin_lock(&obd->obd_dev_lock);
+ obd->obd_stale_clients = 0;
list_for_each_safe(pos, n, &obd->obd_exports) {
exp = list_entry(pos, struct obd_export, exp_obd_chain);
if (test_export(exp))
continue;
- list_del(&exp->exp_obd_chain);
- list_add(&exp->exp_obd_chain, &work_list);
+ list_move(&exp->exp_obd_chain, &work_list);
/* don't count self-export as client */
if (obd_uuid_equals(&exp->exp_client_uuid,
&exp->exp_obd->obd_uuid))
continue;
- cnt++;
+ obd->obd_stale_clients++;
CDEBUG(D_ERROR, "%s: disconnect stale client %s@%s\n",
obd->obd_name, exp->exp_client_uuid.uuid,
exp->exp_connection == NULL ? "<unknown>" :
}
spin_unlock(&obd->obd_dev_lock);
- CDEBUG(D_ERROR, "%s: disconnecting %d stale clients\n",
- obd->obd_name, cnt);
- class_disconnect_export_list(&work_list, get_exp_flags_from_obd(obd));
- RETURN(cnt);
-}
-EXPORT_SYMBOL(class_disconnect_stale_exports);
-
-int oig_init(struct obd_io_group **oig_out)
-{
- struct obd_io_group *oig;
- ENTRY;
-
- OBD_ALLOC(oig, sizeof(*oig));
- if (oig == NULL)
- RETURN(-ENOMEM);
-
- spin_lock_init(&oig->oig_lock);
- oig->oig_rc = 0;
- oig->oig_pending = 0;
- atomic_set(&oig->oig_refcount, 1);
- cfs_waitq_init(&oig->oig_waitq);
- CFS_INIT_LIST_HEAD(&oig->oig_occ_list);
-
- *oig_out = oig;
- RETURN(0);
-};
-EXPORT_SYMBOL(oig_init);
-
-static inline void oig_grab(struct obd_io_group *oig)
-{
- atomic_inc(&oig->oig_refcount);
-}
-
-void oig_release(struct obd_io_group *oig)
-{
- if (atomic_dec_and_test(&oig->oig_refcount))
- OBD_FREE(oig, sizeof(*oig));
-}
-EXPORT_SYMBOL(oig_release);
-
-int oig_add_one(struct obd_io_group *oig, struct oig_callback_context *occ)
-{
- int rc = 0;
- CDEBUG(D_CACHE, "oig %p ready to roll\n", oig);
- spin_lock(&oig->oig_lock);
- if (oig->oig_rc) {
- rc = oig->oig_rc;
- } else {
- oig->oig_pending++;
- if (occ != NULL)
- list_add_tail(&occ->occ_oig_item, &oig->oig_occ_list);
- }
- spin_unlock(&oig->oig_lock);
- oig_grab(oig);
-
- return rc;
-}
-EXPORT_SYMBOL(oig_add_one);
-
-void oig_complete_one(struct obd_io_group *oig,
- struct oig_callback_context *occ, int rc)
-{
- cfs_waitq_t *wake = NULL;
- int old_rc;
-
- spin_lock(&oig->oig_lock);
-
- if (occ != NULL)
- list_del_init(&occ->occ_oig_item);
-
- old_rc = oig->oig_rc;
- if (oig->oig_rc == 0 && rc != 0)
- oig->oig_rc = rc;
+ CDEBUG(D_HA, "%s: disconnecting %d stale clients\n", obd->obd_name,
+ obd->obd_stale_clients);
- if (--oig->oig_pending <= 0)
- wake = &oig->oig_waitq;
-
- spin_unlock(&oig->oig_lock);
-
- CDEBUG(D_CACHE, "oig %p completed, rc %d -> %d via %d, %d now "
- "pending (racey)\n", oig, old_rc, oig->oig_rc, rc,
- oig->oig_pending);
- if (wake)
- cfs_waitq_signal(wake);
- oig_release(oig);
-}
-EXPORT_SYMBOL(oig_complete_one);
-
-static int oig_done(struct obd_io_group *oig)
-{
- int rc = 0;
- spin_lock(&oig->oig_lock);
- if (oig->oig_pending <= 0)
- rc = 1;
- spin_unlock(&oig->oig_lock);
- return rc;
-}
-
-static void interrupted_oig(void *data)
-{
- struct obd_io_group *oig = data;
- struct oig_callback_context *occ;
-
- spin_lock(&oig->oig_lock);
- /* We need to restart the processing each time we drop the lock, as
- * it is possible other threads called oig_complete_one() to remove
- * an entry elsewhere in the list while we dropped lock. We need to
- * drop the lock because osc_ap_completion() calls oig_complete_one()
- * which re-gets this lock ;-) as well as a lock ordering issue. */
-restart:
- list_for_each_entry(occ, &oig->oig_occ_list, occ_oig_item) {
- if (occ->interrupted)
- continue;
- occ->interrupted = 1;
- spin_unlock(&oig->oig_lock);
- occ->occ_interrupted(occ);
- spin_lock(&oig->oig_lock);
- goto restart;
- }
- spin_unlock(&oig->oig_lock);
-}
-
-int oig_wait(struct obd_io_group *oig)
-{
- struct l_wait_info lwi = LWI_INTR(interrupted_oig, oig);
- int rc;
-
- CDEBUG(D_CACHE, "waiting for oig %p\n", oig);
-
- do {
- rc = l_wait_event(oig->oig_waitq, oig_done(oig), &lwi);
- LASSERTF(rc == 0 || rc == -EINTR, "rc: %d\n", rc);
- /* we can't continue until the oig has emptied and stopped
- * referencing state that the caller will free upon return */
- if (rc == -EINTR)
- lwi = (struct l_wait_info){ 0, };
- } while (rc == -EINTR);
-
- LASSERTF(oig->oig_pending == 0,
- "exiting oig_wait(oig = %p) with %d pending\n", oig,
- oig->oig_pending);
-
- CDEBUG(D_CACHE, "done waiting on oig %p rc %d\n", oig, oig->oig_rc);
- return oig->oig_rc;
+ class_disconnect_export_list(&work_list, flags);
+ EXIT;
}
-EXPORT_SYMBOL(oig_wait);
+EXPORT_SYMBOL(class_disconnect_stale_exports);
void class_fail_export(struct obd_export *exp)
{
ENTRY;
do {
- spin_lock (&obd_zombie_impexp_lock);
+ 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(&import->imp_zombie_chain);
+ list_del_init(&import->imp_zombie_chain);
}
export = NULL;
static cfs_waitq_t obd_zombie_waitq;
enum {
- OBD_ZOMBIE_STOP = 1
+ OBD_ZOMBIE_STOP = 1 << 1
};
/**
* check for work for kill zombie import/export thread.
*/
-int obd_zombie_impexp_check(void *arg)
+static int obd_zombie_impexp_check(void *arg)
{
int rc;
}
/**
+ * Add export to the obd_zombe thread and notify it.
+ */
+static void obd_zombie_export_add(struct obd_export *exp) {
+ spin_lock(&obd_zombie_impexp_lock);
+ LASSERT(list_empty(&exp->exp_obd_chain));
+ list_add(&exp->exp_obd_chain, &obd_zombie_exports);
+ spin_unlock(&obd_zombie_impexp_lock);
+
+ if (obd_zombie_impexp_notify != NULL)
+ 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);
+ spin_lock(&obd_zombie_impexp_lock);
+ LASSERT(list_empty(&imp->imp_zombie_chain));
+ list_add(&imp->imp_zombie_chain, &obd_zombie_imports);
+ spin_unlock(&obd_zombie_impexp_lock);
+
+ if (obd_zombie_impexp_notify != NULL)
+ obd_zombie_impexp_notify();
+}
+
+/**
* notify import/export destroy thread about new zombie.
*/
static void obd_zombie_impexp_notify(void)
cfs_waitq_signal(&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 = list_empty(&obd_zombie_imports) &&
+ list_empty(&obd_zombie_exports);
+ spin_unlock(&obd_zombie_impexp_lock);
+ return rc;
+}
+
+/**
+ * wait when obd_zombie import/export queues become empty
+ */
+void obd_zombie_barrier(void)
+{
+ struct l_wait_info lwi = { 0 };
+ l_wait_event(obd_zombie_waitq, obd_zombie_is_idle(), &lwi);
+}
+EXPORT_SYMBOL(obd_zombie_barrier);
+
#ifdef __KERNEL__
/**
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);
-
+ 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.
+ */
+ cfs_waitq_signal(&obd_zombie_waitq);
}
complete(&obd_zombie_stop);
liblustre_register_idle_callback("obd_zombi_impexp_check",
&obd_zombie_impexp_check, NULL);
rc = 0;
-
#endif
RETURN(rc);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff