Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[deliverable/linux.git] / fs / btrfs / super.c

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index e8a7a9f88195140351682d3559d70d052d67f27b..00b8f37cc306df540989a9a888f0fb6cf0eb8a0e 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -304,7 +304,7 @@ enum {
        Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nodiscard,
        Opt_noenospc_debug, Opt_noflushoncommit, Opt_acl, Opt_datacow,
        Opt_datasum, Opt_treelog, Opt_noinode_cache, Opt_usebackuproot,
-       Opt_nologreplay,
+       Opt_nologreplay, Opt_norecovery,
 #ifdef CONFIG_BTRFS_DEBUG
        Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all,
 #endif
@@ -337,6 +337,7 @@ static const match_table_t tokens = {
        {Opt_notreelog, "notreelog"},
        {Opt_treelog, "treelog"},
        {Opt_nologreplay, "nologreplay"},
+       {Opt_norecovery, "norecovery"},
        {Opt_flushoncommit, "flushoncommit"},
        {Opt_noflushoncommit, "noflushoncommit"},
        {Opt_ratio, "metadata_ratio=%d"},
@@ -614,6 +615,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options,
                        btrfs_clear_and_info(root, NOTREELOG,
                                             "enabling tree log");
                        break;
+               case Opt_norecovery:
                case Opt_nologreplay:
                        btrfs_set_and_info(root, NOLOGREPLAY,
                                           "disabling log replay at mount time");
@@ -2188,6 +2190,9 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
                        break;
                ret = !(fs_devices->num_devices == fs_devices->total_devices);
                break;
+       case BTRFS_IOC_GET_SUPPORTED_FEATURES:
+               ret = btrfs_ioctl_get_supported_features((void __user*)arg);
+               break;
        }
 
        kfree(vol);
@@ -2286,7 +2291,7 @@ static void btrfs_interface_exit(void)
        misc_deregister(&btrfs_misc);
 }
 
-static void btrfs_print_info(void)
+static void btrfs_print_mod_info(void)
 {
        printk(KERN_INFO "Btrfs loaded"
 #ifdef CONFIG_BTRFS_DEBUG
@@ -2388,7 +2393,7 @@ static int __init init_btrfs_fs(void)
 
        btrfs_init_lockdep();
 
-       btrfs_print_info();
+       btrfs_print_mod_info();
 
        err = btrfs_run_sanity_tests();
        if (err)