[PATCH] [DLM] fix new_lockspace error exit [5/6]

From: David Teigland <[email protected]>

Fix the error path when exiting new_lockspace().  It was kfree'ing the
lockspace struct at the end, but that's only valid if it exits before
kobject_register occured.  After kobject_register we have to let the
kobject do the freeing.

Signed-off-by: David Teigland <[email protected]>
Signed-off-by: Steven Whitehouse <[email protected]>

diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 339a204..a3a50e6 100644
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -400,6 +400,7 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
 {
 	struct dlm_ls *ls;
 	int i, size, error = -ENOMEM;
+	int do_unreg = 0;
 
 	if (namelen > DLM_LOCKSPACE_LEN)
 		return -EINVAL;
@@ -525,32 +526,34 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
 	error = dlm_recoverd_start(ls);
 	if (error) {
 		log_error(ls, "can't start dlm_recoverd %d", error);
-		goto out_rcomfree;
+		goto out_delist;
 	}
 
-	dlm_create_debug_file(ls);
-
 	error = kobject_setup(ls);
 	if (error)
-		goto out_del;
+		goto out_stop;
 
 	error = kobject_register(&ls->ls_kobj);
 	if (error)
-		goto out_del;
+		goto out_stop;
+
+	/* let kobject handle freeing of ls if there's an error */
+	do_unreg = 1;
 
 	error = do_uevent(ls, 1);
 	if (error)
-		goto out_unreg;
+		goto out_stop;
+
+	dlm_create_debug_file(ls);
+
+	log_debug(ls, "join complete");
 
 	*lockspace = ls;
 	return 0;
 
- out_unreg:
-	kobject_unregister(&ls->ls_kobj);
- out_del:
-	dlm_delete_debug_file(ls);
+ out_stop:
 	dlm_recoverd_stop(ls);
- out_rcomfree:
+ out_delist:
 	spin_lock(&lslist_lock);
 	list_del(&ls->ls_list);
 	spin_unlock(&lslist_lock);
@@ -562,7 +565,10 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
  out_rsbfree:
 	kfree(ls->ls_rsbtbl);
  out_lsfree:
-	kfree(ls);
+	if (do_unreg)
+		kobject_unregister(&ls->ls_kobj);
+	else
+		kfree(ls);
  out:
 	module_put(THIS_MODULE);
 	return error;
@@ -708,7 +714,7 @@ static int release_lockspace(struct dlm_ls *ls, int force)
 	dlm_clear_members_gone(ls);
 	kfree(ls->ls_node_array);
 	kobject_unregister(&ls->ls_kobj);
-        /* The ls structure will be freed when the kobject is done with */
+	/* The ls structure will be freed when the kobject is done with */
 
 	mutex_lock(&ls_lock);
 	ls_count--;
-- 
1.5.1.2

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH] [DLM] wait for config check during join [6/6]
    • From: [email protected]

• References:
  • [GFS2/DLM] Pre-pull Patch Posting
    • From: [email protected]
  • [PATCH] [GFS2] flush the glock completely in inode_go_sync
    • From: [email protected]
  • [PATCH] [DLM] fix a couple of races
    • From: [email protected]
  • [PATCH] [GFS2] kernel changes to support new gfs2_grow command
    • From: [email protected]
  • [PATCH] [GFS2] Kernel changes to support new gfs2_grow command (part 2)
    • From: [email protected]
  • [PATCH] [GFS2] use zero_user_page
    • From: [email protected]
  • [PATCH] [GFS2] Addendum patch 2 for gfs2_grow
    • From: [email protected]
  • [PATCH] [GFS2] Reduce size of struct gdlm_lock
    • From: [email protected]
  • [PATCH] [GFS2] Clean up inode number handling
    • From: [email protected]
  • [PATCH] [GFS2] Quotas non-functional - fix bug
    • From: [email protected]
  • [PATCH] [DLM] keep dlm from panicing when traversing rsb list in debugfs
    • From: [email protected]
  • [PATCH] [DLM] block scand during recovery [1/6]
    • From: [email protected]
  • [PATCH] [DLM] add lock timeouts and warnings [2/6]
    • From: [email protected]
  • [PATCH] [DLM] dlm_device interface changes [3/6]
    • From: [email protected]
  • [PATCH] [DLM] cancel in conversion deadlock [4/6]
    • From: [email protected]

• Prev by Date: [PATCH] [DLM] cancel in conversion deadlock [4/6]
• Next by Date: [PATCH] [DLM] wait for config check during join [6/6]
• Previous by thread: [PATCH] [DLM] cancel in conversion deadlock [4/6]
• Next by thread: [PATCH] [DLM] wait for config check during join [6/6]
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]