diff options
| author | Linus Torvalds | 2019-07-13 02:37:53 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-13 02:37:53 +0200 |
| commit | 964a4eacef67503a1154f7e0a75f52fbdce52022 (patch) | |
| tree | 7654667330f1996a710c418ba9a8a058ab636aec /fs/dlm/main.c | |
| parent | Merge tag '9p-for-5.3' of git://github.com/martinetd/linux (diff) | |
| parent | dlm: no need to check return value of debugfs_create functions (diff) | |
| download | kernel-qcow2-linux-964a4eacef67503a1154f7e0a75f52fbdce52022.tar.gz kernel-qcow2-linux-964a4eacef67503a1154f7e0a75f52fbdce52022.tar.xz kernel-qcow2-linux-964a4eacef67503a1154f7e0a75f52fbdce52022.zip | |
Merge tag 'dlm-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm updates from David Teigland:
"This set removes some unnecessary debugfs error handling, and checks
that lowcomms workqueues are not NULL before destroying"
* tag 'dlm-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: no need to check return value of debugfs_create functions
dlm: check if workqueues are NULL before flushing/destroying
Diffstat (limited to 'fs/dlm/main.c')
| -rw-r--r-- | fs/dlm/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/dlm/main.c b/fs/dlm/main.c index 39579927ed84..afc66a1346d3 100644 --- a/fs/dlm/main.c +++ b/fs/dlm/main.c @@ -35,9 +35,7 @@ static int __init init_dlm(void) if (error) goto out_lockspace; - error = dlm_register_debugfs(); - if (error) - goto out_config; + dlm_register_debugfs(); error = dlm_user_init(); if (error) @@ -61,7 +59,6 @@ static int __init init_dlm(void) dlm_user_exit(); out_debug: dlm_unregister_debugfs(); - out_config: dlm_config_exit(); out_lockspace: dlm_lockspace_exit(); |