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 bf75200c6f86fb765c3607772cee727931b5e70a..00b8f37cc306df540989a9a888f0fb6cf0eb8a0e 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2190,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);
@@ -2288,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
@@ -2390,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)