mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-08-31 21:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs: get rid of dlmglues ocfs2_uninit_super

Browse Source 
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 <mfasheh@versity.com>
This commit is contained in:
Mark Fasheh
2017-09-11 21:57:31 -07:00
committed by Zach Brown
parent fbfbe910aa
commit 5fa97018e5
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kmod/src/dlmglue.c
-5
View File
@@ -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);
}
kmod/src/dlmglue.h
-2
View File
@@ -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);
kmod/src/lock.c
+1 -3
View File
@@ -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;