dlm for 5.3
This set removes some unnecessary debugfs error handling, and checks that lowcomms workqueues are not NULL before destroying. -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJdKKKoAAoJEDgbc8f8gGmqpHUP/AyGkjRy9Z3AkakAzNXmvvHy r7Jh75WSQCt2VEmlxYdwlgtITL9reBO++pYIYwpdKZOKoijeAgnV56InQF8SA6nq dILfSPs0R6HXITzMdBx47Ib0SX9517UoSoi9GLIVzE2vOKMLfSc3/09QMYvU9nUr C+tVgB1KbNFr4IJ34AWr45lR34NlIetsdKprKOh/HqCUbbNMYynfWGXW09FnrLnd uDRWRXPlo5fq1wSxNoRBljb0Pbl4otBhK6BoySqt3D4Id/UJI2vd2xQJJtbwxdtt dIFu9VbLydXlpevrndAYG6j6G4gZX9IPudDee7C6rX0fV3+a3mUqYn9Spi+c49o2 37Z1J43xW8ct1prCmgFpXJDwbsbudq+cmVGvaHjvRJzySSJoyp/UDVdn2l/CEOim rCIgP/zawOq3bqrDIS0ZJXH9lnsJ55stjDtNW/5Hq0uL4934ttTElJ5vjyvS5ABi 9gsqVCRXvEV00U8AD8a8ahXvTHYUNhhARQaEKovhjq9jSb3/rHqMJ/wogRKb2VpV JspqjYavLcSyrtyG3ncX/khk/f2SjSzwvmEb8l2aN186QMH8jsm0XPekWYFQMhdR CyknNKgO0Ye+g48d1P9euuj6PNF/qqBnx5yWNC6nFDQFa648IV1LOaxKW+eGMF9o UFY42yrSmxWw+gkFxXbo =Mhya -----END PGP SIGNATURE----- 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
This commit is contained in:
Коммит
964a4eacef
|
@ -737,7 +737,7 @@ void dlm_delete_debug_file(struct dlm_ls *ls)
|
|||
debugfs_remove(ls->ls_debug_toss_dentry);
|
||||
}
|
||||
|
||||
int dlm_create_debug_file(struct dlm_ls *ls)
|
||||
void dlm_create_debug_file(struct dlm_ls *ls)
|
||||
{
|
||||
char name[DLM_LOCKSPACE_LEN + 8];
|
||||
|
||||
|
@ -748,8 +748,6 @@ int dlm_create_debug_file(struct dlm_ls *ls)
|
|||
dlm_root,
|
||||
ls,
|
||||
&format1_fops);
|
||||
if (!ls->ls_debug_rsb_dentry)
|
||||
goto fail;
|
||||
|
||||
/* format 2 */
|
||||
|
||||
|
@ -761,8 +759,6 @@ int dlm_create_debug_file(struct dlm_ls *ls)
|
|||
dlm_root,
|
||||
ls,
|
||||
&format2_fops);
|
||||
if (!ls->ls_debug_locks_dentry)
|
||||
goto fail;
|
||||
|
||||
/* format 3 */
|
||||
|
||||
|
@ -774,8 +770,6 @@ int dlm_create_debug_file(struct dlm_ls *ls)
|
|||
dlm_root,
|
||||
ls,
|
||||
&format3_fops);
|
||||
if (!ls->ls_debug_all_dentry)
|
||||
goto fail;
|
||||
|
||||
/* format 4 */
|
||||
|
||||
|
@ -787,8 +781,6 @@ int dlm_create_debug_file(struct dlm_ls *ls)
|
|||
dlm_root,
|
||||
ls,
|
||||
&format4_fops);
|
||||
if (!ls->ls_debug_toss_dentry)
|
||||
goto fail;
|
||||
|
||||
memset(name, 0, sizeof(name));
|
||||
snprintf(name, DLM_LOCKSPACE_LEN + 8, "%s_waiters", ls->ls_name);
|
||||
|
@ -798,21 +790,12 @@ int dlm_create_debug_file(struct dlm_ls *ls)
|
|||
dlm_root,
|
||||
ls,
|
||||
&waiters_fops);
|
||||
if (!ls->ls_debug_waiters_dentry)
|
||||
goto fail;
|
||||
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
dlm_delete_debug_file(ls);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
int __init dlm_register_debugfs(void)
|
||||
void __init dlm_register_debugfs(void)
|
||||
{
|
||||
mutex_init(&debug_buf_lock);
|
||||
dlm_root = debugfs_create_dir("dlm", NULL);
|
||||
return dlm_root ? 0 : -ENOMEM;
|
||||
}
|
||||
|
||||
void dlm_unregister_debugfs(void)
|
||||
|
|
|
@ -719,14 +719,14 @@ int dlm_plock_init(void);
|
|||
void dlm_plock_exit(void);
|
||||
|
||||
#ifdef CONFIG_DLM_DEBUG
|
||||
int dlm_register_debugfs(void);
|
||||
void dlm_register_debugfs(void);
|
||||
void dlm_unregister_debugfs(void);
|
||||
int dlm_create_debug_file(struct dlm_ls *ls);
|
||||
void dlm_create_debug_file(struct dlm_ls *ls);
|
||||
void dlm_delete_debug_file(struct dlm_ls *ls);
|
||||
#else
|
||||
static inline int dlm_register_debugfs(void) { return 0; }
|
||||
static inline void dlm_register_debugfs(void) { }
|
||||
static inline void dlm_unregister_debugfs(void) { }
|
||||
static inline int dlm_create_debug_file(struct dlm_ls *ls) { return 0; }
|
||||
static inline void dlm_create_debug_file(struct dlm_ls *ls) { }
|
||||
static inline void dlm_delete_debug_file(struct dlm_ls *ls) { }
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1628,7 +1628,9 @@ static void clean_writequeues(void)
|
|||
|
||||
static void work_stop(void)
|
||||
{
|
||||
if (recv_workqueue)
|
||||
destroy_workqueue(recv_workqueue);
|
||||
if (send_workqueue)
|
||||
destroy_workqueue(send_workqueue);
|
||||
}
|
||||
|
||||
|
@ -1689,12 +1691,16 @@ static void work_flush(void)
|
|||
struct hlist_node *n;
|
||||
struct connection *con;
|
||||
|
||||
if (recv_workqueue)
|
||||
flush_workqueue(recv_workqueue);
|
||||
if (send_workqueue)
|
||||
flush_workqueue(send_workqueue);
|
||||
do {
|
||||
ok = 1;
|
||||
foreach_conn(stop_conn);
|
||||
if (recv_workqueue)
|
||||
flush_workqueue(recv_workqueue);
|
||||
if (send_workqueue)
|
||||
flush_workqueue(send_workqueue);
|
||||
for (i = 0; i < CONN_HASH_SIZE && ok; i++) {
|
||||
hlist_for_each_entry_safe(con, n,
|
||||
|
|
|
@ -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();
|
||||
|
|
Загрузка…
Ссылка в новой задаче