---

yaml
---
r: 38801
b: refs/heads/master
c: 5f88f1e
h: refs/heads/master
i:
  38799: d512456
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dc39fe621ead2fa2a0439a686be4df185861eae
+refs/heads/master: 5f88f1ea16a2fb5f125505053d1bfb7901a88c64

trunk/fs/dlm/lockspace.c

@@ -488,16 +488,17 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
 
 	down_write(&ls->ls_in_recovery);
 
+	spin_lock(&lslist_lock);
+	list_add(&ls->ls_list, &lslist);
+	spin_unlock(&lslist_lock);
+
+	/* needs to find ls in lslist */
 	error = dlm_recoverd_start(ls);
 	if (error) {
 		log_error(ls, "can't start dlm_recoverd %d", error);
 		goto out_rcomfree;
 	}
 
-	spin_lock(&lslist_lock);
-	list_add(&ls->ls_list, &lslist);
-	spin_unlock(&lslist_lock);
-
 	dlm_create_debug_file(ls);
 
 	error = kobject_setup(ls);
@@ -519,11 +520,11 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
 	kobject_unregister(&ls->ls_kobj);
  out_del:
 	dlm_delete_debug_file(ls);
+	dlm_recoverd_stop(ls);
+ out_rcomfree:
 	spin_lock(&lslist_lock);
 	list_del(&ls->ls_list);
 	spin_unlock(&lslist_lock);
-	dlm_recoverd_stop(ls);
- out_rcomfree:
 	kfree(ls->ls_recover_buf);
  out_dirfree:
 	kfree(ls->ls_dirtbl);

trunk/fs/dlm/recoverd.c

@@ -234,6 +234,10 @@ static int dlm_recoverd(void *arg)
 	struct dlm_ls *ls;
 
 	ls = dlm_find_lockspace_local(arg);
+	if (!ls) {
+		log_print("dlm_recoverd: no lockspace %p", arg);
+		return -1;
+	}
 
 	while (!kthread_should_stop()) {
 		set_current_state(TASK_INTERRUPTIBLE);