diff options
| author | Dmitry Torokhov <[email protected]> | 2023-05-01 15:20:08 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-05-01 15:20:08 -0700 | 
| commit | 9a87ffc99ec8eb8d35eed7c4f816d75f5cc9662e (patch) | |
| tree | d57f3a63479a07b4e0cece029886e76e04feb984 /kernel/fail_function.c | |
| parent | 5dc63e56a9cf8df0b59c234a505a1653f1bdf885 (diff) | |
| parent | 53bea86b5712c7491bb3dae12e271666df0a308c (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.4 merge window.
Diffstat (limited to 'kernel/fail_function.c')
| -rw-r--r-- | kernel/fail_function.c | 5 | 
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/fail_function.c b/kernel/fail_function.c index a7ccd2930c5f..d971a0189319 100644 --- a/kernel/fail_function.c +++ b/kernel/fail_function.c @@ -163,10 +163,7 @@ static void fei_debugfs_add_attr(struct fei_attr *attr)  static void fei_debugfs_remove_attr(struct fei_attr *attr)  { -	struct dentry *dir; - -	dir = debugfs_lookup(attr->kp.symbol_name, fei_debugfs_dir); -	debugfs_remove_recursive(dir); +	debugfs_lookup_and_remove(attr->kp.symbol_name, fei_debugfs_dir);  }  static int fei_kprobe_handler(struct kprobe *kp, struct pt_regs *regs)  |