Commit 2d4cf5ae authored by Brian Norris's avatar Brian Norris Committed by Artem Bityutskiy

UBIFS: correct usage of IS_ENABLED()

Commit "818039c7 UBIFS: fix debugfs-less systems support" fixed one
regression but introduced a different regression - the debugfs is now always
compiled out. Root cause: IS_ENABLED() arguments should be used with the
CONFIG_* prefix.
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 1cfb7271
...@@ -2918,7 +2918,7 @@ int dbg_debugfs_init_fs(struct ubifs_info *c) ...@@ -2918,7 +2918,7 @@ int dbg_debugfs_init_fs(struct ubifs_info *c)
struct dentry *dent; struct dentry *dent;
struct ubifs_debug_info *d = c->dbg; struct ubifs_debug_info *d = c->dbg;
if (!IS_ENABLED(DEBUG_FS)) if (!IS_ENABLED(CONFIG_DEBUG_FS))
return 0; return 0;
n = snprintf(d->dfs_dir_name, UBIFS_DFS_DIR_LEN + 1, UBIFS_DFS_DIR_NAME, n = snprintf(d->dfs_dir_name, UBIFS_DFS_DIR_LEN + 1, UBIFS_DFS_DIR_NAME,
...@@ -3013,7 +3013,7 @@ int dbg_debugfs_init_fs(struct ubifs_info *c) ...@@ -3013,7 +3013,7 @@ int dbg_debugfs_init_fs(struct ubifs_info *c)
*/ */
void dbg_debugfs_exit_fs(struct ubifs_info *c) void dbg_debugfs_exit_fs(struct ubifs_info *c)
{ {
if (IS_ENABLED(DEBUG_FS)) if (IS_ENABLED(CONFIG_DEBUG_FS))
debugfs_remove_recursive(c->dbg->dfs_dir); debugfs_remove_recursive(c->dbg->dfs_dir);
} }
...@@ -3099,7 +3099,7 @@ int dbg_debugfs_init(void) ...@@ -3099,7 +3099,7 @@ int dbg_debugfs_init(void)
const char *fname; const char *fname;
struct dentry *dent; struct dentry *dent;
if (!IS_ENABLED(DEBUG_FS)) if (!IS_ENABLED(CONFIG_DEBUG_FS))
return 0; return 0;
fname = "ubifs"; fname = "ubifs";
...@@ -3166,7 +3166,7 @@ int dbg_debugfs_init(void) ...@@ -3166,7 +3166,7 @@ int dbg_debugfs_init(void)
*/ */
void dbg_debugfs_exit(void) void dbg_debugfs_exit(void)
{ {
if (IS_ENABLED(DEBUG_FS)) if (IS_ENABLED(CONFIG_DEBUG_FS))
debugfs_remove_recursive(dfs_rootdir); debugfs_remove_recursive(dfs_rootdir);
} }
......
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