hulk inclusion category: bugfix bugzilla: 30939 CVE: NA --------------------------- The kabi can be broken before official release. This reverts commit ce620c1a6783b2341a376ef948484b5314ed064e. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Reviewed-By: Xie XiuQi <xiexiuqi@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- fs/debugfs/inode.c | 6 ------ include/linux/debugfs.h | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index 59e5e49..11664fd 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c @@ -672,12 +672,6 @@ 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 3b0ba54..5fdcfef 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); -void debugfs_remove_recursive(struct dentry *dentry); +#define debugfs_remove_recursive debugfs_remove const struct file_operations *debugfs_real_fops(const struct file *filp); -- 1.8.3