diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/obdclass/genops.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/obdclass/genops.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/staging/lustre/lustre/obdclass/genops.c b/drivers/staging/lustre/lustre/obdclass/genops.c index d9f750d..f2bdea3 100644 --- a/drivers/staging/lustre/lustre/obdclass/genops.c +++ b/drivers/staging/lustre/lustre/obdclass/genops.c @@ -1010,6 +1010,8 @@ struct obd_import *class_new_import(struct obd_device *obd) INIT_LIST_HEAD(&imp->imp_replay_list); INIT_LIST_HEAD(&imp->imp_sending_list); INIT_LIST_HEAD(&imp->imp_delayed_list); + INIT_LIST_HEAD(&imp->imp_committed_list); + imp->imp_replay_cursor = &imp->imp_committed_list; spin_lock_init(&imp->imp_lock); imp->imp_last_success_conn = 0; imp->imp_state = LUSTRE_IMP_NEW; @@ -1532,8 +1534,8 @@ void obd_exports_barrier(struct obd_device *obd) spin_lock(&obd->obd_dev_lock); while (!list_empty(&obd->obd_unlinked_exports)) { spin_unlock(&obd->obd_dev_lock); - schedule_timeout_and_set_state(TASK_UNINTERRUPTIBLE, - cfs_time_seconds(waited)); + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout(cfs_time_seconds(waited)); if (waited > 5 && IS_PO2(waited)) { LCONSOLE_WARN("%s is waiting for obd_unlinked_exports " "more than %d seconds. " @@ -1625,7 +1627,7 @@ static int obd_zombie_impexp_check(void *arg) } /** - * Add export to the obd_zombe thread and notify it. + * Add export to the obd_zombie thread and notify it. */ static void obd_zombie_export_add(struct obd_export *exp) { spin_lock(&exp->exp_obd->obd_dev_lock); @@ -1641,7 +1643,7 @@ static void obd_zombie_export_add(struct obd_export *exp) { } /** - * Add import to the obd_zombe thread and notify it. + * Add import to the obd_zombie thread and notify it. */ static void obd_zombie_import_add(struct obd_import *imp) { LASSERT(imp->imp_sec == NULL); @@ -1661,7 +1663,7 @@ static void obd_zombie_import_add(struct obd_import *imp) { static void obd_zombie_impexp_notify(void) { /* - * Make sure obd_zomebie_impexp_thread get this notification. + * Make sure obd_zombie_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 */ |
