From 5fa97018e50723e1e3e5f3845e7b789217d4fc9a Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Mon, 11 Sep 2017 16:38:28 -0500 Subject: [PATCH] scoutfs: get rid of dlmglues ocfs2_uninit_super All this does is uninitialize the dlmglue debug infrastructure, however we already do that in ocfs2_dlm_shutdown(), resulting in some double frees on unmount. Signed-off-by: Mark Fasheh --- kmod/src/dlmglue.c | 5 ----- kmod/src/dlmglue.h | 2 -- kmod/src/lock.c | 4 +--- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/kmod/src/dlmglue.c b/kmod/src/dlmglue.c index 49fc1e56..f1c206aa 100644 --- a/kmod/src/dlmglue.c +++ b/kmod/src/dlmglue.c @@ -4334,8 +4334,3 @@ int ocfs2_init_super(struct ocfs2_super *osb, int flags) return 0; } - -void ocfs2_uninit_super(struct ocfs2_super *osb) -{ - ocfs2_dlm_shutdown_debug(osb); -} diff --git a/kmod/src/dlmglue.h b/kmod/src/dlmglue.h index 61b4af76..0d852743 100644 --- a/kmod/src/dlmglue.h +++ b/kmod/src/dlmglue.h @@ -309,8 +309,6 @@ void ocfs2_cluster_unlock(struct ocfs2_super *osb, struct ocfs2_lock_res *lockres, int level); int ocfs2_init_super(struct ocfs2_super *osb, int flags); -void ocfs2_uninit_super(struct ocfs2_super *osb); - int ocfs2_dlm_init(struct ocfs2_super *osb, char *cluster_stack, char *cluster_name, char *ls_name, struct dentry *debug_root); void ocfs2_dlm_shutdown(struct ocfs2_super *osb, int hangup_pending); diff --git a/kmod/src/lock.c b/kmod/src/lock.c index 459f6c95..d2023596 100644 --- a/kmod/src/lock.c +++ b/kmod/src/lock.c @@ -739,10 +739,8 @@ void scoutfs_lock_destroy(struct super_block *sb) */ free_lock_tree(sb); - if (linfo->dlmglue_online) { + if (linfo->dlmglue_online) ocfs2_dlm_shutdown(&linfo->dlmglue, 0); - ocfs2_uninit_super(&linfo->dlmglue); - } sbi->lock_info = NULL;