Commit e9b4cf20 authored by Artem Bityutskiy's avatar Artem Bityutskiy

UBI: fix debugfs-less systems support

Commit "aa44d1d3 UBI: remove Kconfig debugging option" broke UBI and it
refuses to initialize if debugfs (CONFIG_DEBUG_FS) is disabled. I incorrectly
assumed that debugfs files creation function will return success if debugfs
is disabled, but they actually return -ENODEV. This patch fixes the issue.
Reported-by: default avatarPaul Parsons <lost.distance@yahoo.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Tested-by: default avatarPaul Parsons <lost.distance@yahoo.com>
parent f8f5701b
...@@ -264,6 +264,9 @@ static struct dentry *dfs_rootdir; ...@@ -264,6 +264,9 @@ static struct dentry *dfs_rootdir;
*/ */
int ubi_debugfs_init(void) int ubi_debugfs_init(void)
{ {
if (!IS_ENABLED(DEBUG_FS))
return 0;
dfs_rootdir = debugfs_create_dir("ubi", NULL); dfs_rootdir = debugfs_create_dir("ubi", NULL);
if (IS_ERR_OR_NULL(dfs_rootdir)) { if (IS_ERR_OR_NULL(dfs_rootdir)) {
int err = dfs_rootdir ? -ENODEV : PTR_ERR(dfs_rootdir); int err = dfs_rootdir ? -ENODEV : PTR_ERR(dfs_rootdir);
...@@ -281,6 +284,7 @@ int ubi_debugfs_init(void) ...@@ -281,6 +284,7 @@ int ubi_debugfs_init(void)
*/ */
void ubi_debugfs_exit(void) void ubi_debugfs_exit(void)
{ {
if (IS_ENABLED(DEBUG_FS))
debugfs_remove(dfs_rootdir); debugfs_remove(dfs_rootdir);
} }
...@@ -403,6 +407,9 @@ int ubi_debugfs_init_dev(struct ubi_device *ubi) ...@@ -403,6 +407,9 @@ int ubi_debugfs_init_dev(struct ubi_device *ubi)
struct dentry *dent; struct dentry *dent;
struct ubi_debug_info *d = ubi->dbg; struct ubi_debug_info *d = ubi->dbg;
if (!IS_ENABLED(DEBUG_FS))
return 0;
n = snprintf(d->dfs_dir_name, UBI_DFS_DIR_LEN + 1, UBI_DFS_DIR_NAME, n = snprintf(d->dfs_dir_name, UBI_DFS_DIR_LEN + 1, UBI_DFS_DIR_NAME,
ubi->ubi_num); ubi->ubi_num);
if (n == UBI_DFS_DIR_LEN) { if (n == UBI_DFS_DIR_LEN) {
...@@ -470,5 +477,6 @@ int ubi_debugfs_init_dev(struct ubi_device *ubi) ...@@ -470,5 +477,6 @@ int ubi_debugfs_init_dev(struct ubi_device *ubi)
*/ */
void ubi_debugfs_exit_dev(struct ubi_device *ubi) void ubi_debugfs_exit_dev(struct ubi_device *ubi)
{ {
if (IS_ENABLED(DEBUG_FS))
debugfs_remove_recursive(ubi->dbg->dfs_dir); debugfs_remove_recursive(ubi->dbg->dfs_dir);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment