scoutfs: stop spurious lockdep warning from dlm

The fs/dlm code has a harmless but unannotated inversion between
connection and socket locking that triggers during shutdown and disables
lockdep.  We don't want it to mask our warnings during testing that may
happen after the first shared unmount so we disable lockdep around the
dlm shutdown.  It's not ideal but then neither are distro kernels that
ship with lockdep warnings.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2017-10-06 13:56:03 -07:00
committed by Mark Fasheh
parent 8dee30047c
commit a30f0bf82f

View File

@@ -826,8 +826,17 @@ void scoutfs_lock_destroy(struct super_block *sb)
*/
free_lock_tree(sb);
if (linfo->dlmglue_online)
if (linfo->dlmglue_online) {
/*
* fs/dlm has a harmless but unannotated
* inversion between their connection and socket
* locking that triggers during shutdown and
* disables lockdep.
*/
lockdep_off();
ocfs2_dlm_shutdown(&linfo->dlmglue, 0);
lockdep_on();
}
sbi->lock_info = NULL;