From 27d247b2d86044df9fd2fc6a35343e6d1852d60c Mon Sep 17 00:00:00 2001 From: yu kuai Date: Thu, 20 Feb 2020 15:19:39 +0800 Subject: [PATCH] debugfs: fix kabi for function debugfs_remove_recursive hulk inclusion category: bugfix bugzilla: 24454 CVE: NA --------------------------- debugfs_remove_recursive was changed from a function to an alias to debugfs_remove in patch "simple_recursive_removal(): kernel-side rm -rf for ramfs-style filesystems". Change it back to a function. Signed-off-by: yu kuai Reviewed-by: zhangyi (F) Signed-off-by: Yang Yingliang --- fs/debugfs/inode.c | 6 ++++++ include/linux/debugfs.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index 11664fdf5a3c..59e5e491a7ec 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c @@ -672,6 +672,12 @@ void debugfs_remove(struct dentry *dentry) } EXPORT_SYMBOL_GPL(debugfs_remove); +void debugfs_remove_recursive(struct dentry *dentry) +{ + debugfs_remove(dentry); +} +EXPORT_SYMBOL_GPL(debugfs_remove_recursive); + /** * debugfs_rename - rename a file/directory in the debugfs filesystem * @old_dir: a pointer to the parent dentry for the renamed object. This diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h index 5fdcfeff9308..3b0ba54cc4d5 100644 --- a/include/linux/debugfs.h +++ b/include/linux/debugfs.h @@ -82,7 +82,7 @@ struct dentry *debugfs_create_automount(const char *name, void *data); void debugfs_remove(struct dentry *dentry); -#define debugfs_remove_recursive debugfs_remove +void debugfs_remove_recursive(struct dentry *dentry); const struct file_operations *debugfs_real_fops(const struct file *filp); -- GitLab