From: yu kuai <yukuai3@huawei.com> 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 <yukuai3@huawei.com> Reviewed-by: zhangyi (F) <yi.zhang@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- 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 11664fd..59e5e49 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 5fdcfef..3b0ba54 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); -- 1.8.3