summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2013-04-30 16:51:59 +0000
committerJosef Bacik <jbacik@fusionio.com>2013-06-14 11:29:19 -0400
commit85965600f50b2e57746363d0ace4ab6b2bcb9c27 (patch)
treebda27684f90cd479b4b3d4488fd9b31f01706151
parente6d2960582f625ba6e676117019b62aa87425e8f (diff)
downloadtalos-op-linux-85965600f50b2e57746363d0ace4ab6b2bcb9c27.tar.gz
talos-op-linux-85965600f50b2e57746363d0ace4ab6b2bcb9c27.zip
btrfs: show compiled-in config features at module load time
We want to know if there are debugging features compiled in, this may affect performance. The message is printed before the sanity checks. Also kill version.h file that serves no purpose, we don't use any version tag for kernel module. Signed-off-by: David Sterba <dsterba@suse.cz> Signed-off-by: Josef Bacik <jbacik@fusionio.com>
-rw-r--r--fs/btrfs/super.c15
-rw-r--r--fs/btrfs/version.h4
2 files changed, 13 insertions, 6 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 107c6e23cbc0..0805dd3b856e 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -51,7 +51,6 @@
#include "print-tree.h"
#include "xattr.h"
#include "volumes.h"
-#include "version.h"
#include "export.h"
#include "compression.h"
#include "rcu-string.h"
@@ -1685,6 +1684,18 @@ static void btrfs_interface_exit(void)
printk(KERN_INFO "btrfs: misc_deregister failed for control device\n");
}
+static void btrfs_print_info(void)
+{
+ printk(KERN_INFO "Btrfs loaded"
+#ifdef CONFIG_BTRFS_DEBUG
+ ", debug=on"
+#endif
+#ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
+ ", integrity-checker=on"
+#endif
+ "\n");
+}
+
static int __init init_btrfs_fs(void)
{
int err;
@@ -1733,9 +1744,9 @@ static int __init init_btrfs_fs(void)
btrfs_init_lockdep();
+ btrfs_print_info();
btrfs_test_free_space_cache();
- printk(KERN_INFO "%s loaded\n", BTRFS_BUILD_VERSION);
return 0;
unregister_ioctl:
diff --git a/fs/btrfs/version.h b/fs/btrfs/version.h
deleted file mode 100644
index 9bf3946d5ef2..000000000000
--- a/fs/btrfs/version.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __BTRFS_VERSION_H
-#define __BTRFS_VERSION_H
-#define BTRFS_BUILD_VERSION "Btrfs"
-#endif
OpenPOWER on IntegriCloud