Skip to content

Commit

Permalink
UBIFS: correct usage of IS_ENABLED()
Browse files Browse the repository at this point in the history
Commit "818039c 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: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
  • Loading branch information
Brian Norris authored and Artem Bityutskiy committed Jun 27, 2012
1 parent 1cfb727 commit 2d4cf5a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions fs/ubifs/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -2918,7 +2918,7 @@ int dbg_debugfs_init_fs(struct ubifs_info *c)
struct dentry *dent;
struct ubifs_debug_info *d = c->dbg;

if (!IS_ENABLED(DEBUG_FS))
if (!IS_ENABLED(CONFIG_DEBUG_FS))
return 0;

n = snprintf(d->dfs_dir_name, UBIFS_DFS_DIR_LEN + 1, UBIFS_DFS_DIR_NAME,
Expand Down Expand Up @@ -3013,7 +3013,7 @@ int dbg_debugfs_init_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);
}

Expand Down Expand Up @@ -3099,7 +3099,7 @@ int dbg_debugfs_init(void)
const char *fname;
struct dentry *dent;

if (!IS_ENABLED(DEBUG_FS))
if (!IS_ENABLED(CONFIG_DEBUG_FS))
return 0;

fname = "ubifs";
Expand Down Expand Up @@ -3166,7 +3166,7 @@ int dbg_debugfs_init(void)
*/
void dbg_debugfs_exit(void)
{
if (IS_ENABLED(DEBUG_FS))
if (IS_ENABLED(CONFIG_DEBUG_FS))
debugfs_remove_recursive(dfs_rootdir);
}

Expand Down

0 comments on commit 2d4cf5a

Please sign in to comment.