btrfs: remove duplicate includes

[sfrench/cifs-2.6.git] / fs / btrfs / super.c

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 3a4dce1536455416a4f609f99ec416b61811f592..428841a17acbb53a2f9c1e0aababb354dd7d1faf 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -61,7 +61,6 @@
 #include "tests/btrfs-tests.h"
 
 #include "qgroup.h"
-#include "backref.h"
 #define CREATE_TRACE_POINTS
 #include <trace/events/btrfs.h>
 
@@ -1243,7 +1242,7 @@ int btrfs_sync_fs(struct super_block *sb, int wait)
 static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)
 {
        struct btrfs_fs_info *info = btrfs_sb(dentry->d_sb);
-       char *compress_type;
+       const char *compress_type;
 
        if (btrfs_test_opt(info, DEGRADED))
                seq_puts(seq, ",degraded");
@@ -1259,12 +1258,7 @@ static int btrfs_show_options(struct seq_file *seq, struct dentry *dentry)
                                             num_online_cpus() + 2, 8))
                seq_printf(seq, ",thread_pool=%d", info->thread_pool_size);
        if (btrfs_test_opt(info, COMPRESS)) {
-               if (info->compress_type == BTRFS_COMPRESS_ZLIB)
-                       compress_type = "zlib";
-               else if (info->compress_type == BTRFS_COMPRESS_LZO)
-                       compress_type = "lzo";
-               else
-                       compress_type = "zstd";
+               compress_type = btrfs_compress_type2str(info->compress_type);
                if (btrfs_test_opt(info, FORCE_COMPRESS))
                        seq_printf(seq, ",compress-force=%s", compress_type);
                else
@@ -1972,8 +1966,10 @@ static int btrfs_calc_avail_data_space(struct btrfs_fs_info *fs_info,
 
        rcu_read_lock();
        list_for_each_entry_rcu(device, &fs_devices->devices, dev_list) {
-               if (!device->in_fs_metadata || !device->bdev ||
-                   device->is_tgtdev_for_dev_replace)
+               if (!test_bit(BTRFS_DEV_STATE_IN_FS_METADATA,
+                                               &device->dev_state) ||
+                   !device->bdev ||
+                   test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state))
                        continue;
 
                if (i >= nr_devices)
@@ -2269,7 +2265,7 @@ static int btrfs_show_devname(struct seq_file *m, struct dentry *root)
        while (cur_devices) {
                head = &cur_devices->devices;
                list_for_each_entry(dev, head, dev_list) {
-                       if (dev->missing)
+                       if (test_bit(BTRFS_DEV_STATE_MISSING, &dev->dev_state))
                                continue;
                        if (!dev->name)
                                continue;
@@ -2324,7 +2320,7 @@ static struct miscdevice btrfs_misc = {
 MODULE_ALIAS_MISCDEV(BTRFS_MINOR);
 MODULE_ALIAS("devname:btrfs-control");
 
-static int btrfs_interface_init(void)
+static int __init btrfs_interface_init(void)
 {
        return misc_register(&btrfs_misc);
 }
@@ -2334,7 +2330,7 @@ static void btrfs_interface_exit(void)
        misc_deregister(&btrfs_misc);
 }
 
-static void btrfs_print_mod_info(void)
+static void __init btrfs_print_mod_info(void)
 {
        pr_info("Btrfs loaded, crc32c=%s"
 #ifdef CONFIG_BTRFS_DEBUG