diff options
author | Brian Norris <computersforpeace@gmail.com> | 2012-06-18 19:31:22 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-06-27 07:22:15 -0400 |
commit | 2d4cf5ae123e4a7bd26a88e600581aa809bcad7f (patch) | |
tree | aed2a224a4833b4a49b2eff21801d54198048493 /fs | |
parent | 1cfb7271076a265b7c2cbbf9cf5c2ae060a24385 (diff) |
UBIFS: correct usage of IS_ENABLED()
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ubifs/debug.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index 84a7e6f3c046..92df3b081539 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c | |||
@@ -2918,7 +2918,7 @@ int dbg_debugfs_init_fs(struct ubifs_info *c) | |||
2918 | struct dentry *dent; | 2918 | struct dentry *dent; |
2919 | struct ubifs_debug_info *d = c->dbg; | 2919 | struct ubifs_debug_info *d = c->dbg; |
2920 | 2920 | ||
2921 | if (!IS_ENABLED(DEBUG_FS)) | 2921 | if (!IS_ENABLED(CONFIG_DEBUG_FS)) |
2922 | return 0; | 2922 | return 0; |
2923 | 2923 | ||
2924 | n = snprintf(d->dfs_dir_name, UBIFS_DFS_DIR_LEN + 1, UBIFS_DFS_DIR_NAME, | 2924 | n = snprintf(d->dfs_dir_name, UBIFS_DFS_DIR_LEN + 1, UBIFS_DFS_DIR_NAME, |
@@ -3013,7 +3013,7 @@ out: | |||
3013 | */ | 3013 | */ |
3014 | void dbg_debugfs_exit_fs(struct ubifs_info *c) | 3014 | void dbg_debugfs_exit_fs(struct ubifs_info *c) |
3015 | { | 3015 | { |
3016 | if (IS_ENABLED(DEBUG_FS)) | 3016 | if (IS_ENABLED(CONFIG_DEBUG_FS)) |
3017 | debugfs_remove_recursive(c->dbg->dfs_dir); | 3017 | debugfs_remove_recursive(c->dbg->dfs_dir); |
3018 | } | 3018 | } |
3019 | 3019 | ||
@@ -3099,7 +3099,7 @@ int dbg_debugfs_init(void) | |||
3099 | const char *fname; | 3099 | const char *fname; |
3100 | struct dentry *dent; | 3100 | struct dentry *dent; |
3101 | 3101 | ||
3102 | if (!IS_ENABLED(DEBUG_FS)) | 3102 | if (!IS_ENABLED(CONFIG_DEBUG_FS)) |
3103 | return 0; | 3103 | return 0; |
3104 | 3104 | ||
3105 | fname = "ubifs"; | 3105 | fname = "ubifs"; |
@@ -3166,7 +3166,7 @@ out: | |||
3166 | */ | 3166 | */ |
3167 | void dbg_debugfs_exit(void) | 3167 | void dbg_debugfs_exit(void) |
3168 | { | 3168 | { |
3169 | if (IS_ENABLED(DEBUG_FS)) | 3169 | if (IS_ENABLED(CONFIG_DEBUG_FS)) |
3170 | debugfs_remove_recursive(dfs_rootdir); | 3170 | debugfs_remove_recursive(dfs_rootdir); |
3171 | } | 3171 | } |
3172 | 3172 | ||