btrfs-progs: Introduce kernel sizes to cleanup large intermediate number

[platform/upstream/btrfs-progs.git] / disk-io.c

diff --git a/disk-io.c b/disk-io.c
index f989c29..318128c 100644 (file)
--- a/disk-io.c
+++ b/disk-io.c
@@ -207,7 +207,7 @@ void readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize,
                             bytenr, &length, &multi, 0, NULL)) {
                device = multi->stripes[0].dev;
                device->total_ios++;
-               blocksize = min(blocksize, (u32)(64 * 1024));
+               blocksize = min(blocksize, (u32)SZ_64K);
                readahead(device->fd, multi->stripes[0].physical, blocksize);
        }
 
@@ -494,7 +494,6 @@ void btrfs_setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
        root->fs_info = fs_info;
        root->objectid = objectid;
        root->last_trans = 0;
-       root->highest_inode = 0;
        root->last_inode_alloc = 0;
 
        INIT_LIST_HEAD(&root->dirty_list);
@@ -904,7 +903,8 @@ free_all:
        return NULL;
 }
 
-int btrfs_check_fs_compatibility(struct btrfs_super_block *sb, int writable)
+int btrfs_check_fs_compatibility(struct btrfs_super_block *sb,
+                                unsigned int flags)
 {
        u64 features;
 
@@ -923,13 +923,22 @@ int btrfs_check_fs_compatibility(struct btrfs_super_block *sb, int writable)
                btrfs_set_super_incompat_flags(sb, features);
        }
 
-       features = btrfs_super_compat_ro_flags(sb) &
-               ~BTRFS_FEATURE_COMPAT_RO_SUPP;
-       if (writable && features) {
-               printk("couldn't open RDWR because of unsupported "
-                      "option features (%Lx).\n",
-                      (unsigned long long)features);
-               return -ENOTSUP;
+       features = btrfs_super_compat_ro_flags(sb);
+       if (flags & OPEN_CTREE_WRITES) {
+               if (flags & OPEN_CTREE_INVALIDATE_FST) {
+                       /* Clear the FREE_SPACE_TREE_VALID bit on disk... */
+                       features &= ~BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE_VALID;
+                       btrfs_set_super_compat_ro_flags(sb, features);
+                       /* ... and ignore the free space tree bit. */
+                       features &= ~BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE;
+               }
+               if (features & ~BTRFS_FEATURE_COMPAT_RO_SUPP) {
+                       printk("couldn't open RDWR because of unsupported "
+                              "option features (%Lx).\n",
+                              (unsigned long long)features);
+                       return -ENOTSUP;
+               }
+
        }
        return 0;
 }
@@ -1053,7 +1062,7 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr,
        if (ret == 0)
                fs_info->quota_enabled = 1;
 
-       if (btrfs_fs_compat_ro(fs_info, BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE)) {
+       if (btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE)) {
                ret = find_and_setup_root(root, fs_info, BTRFS_FREE_SPACE_TREE_OBJECTID,
                                          fs_info->free_space_root);
                if (ret) {
@@ -1167,7 +1176,7 @@ int btrfs_scan_fs_devices(int fd, const char *path,
        }
 
        if (!skip_devices && total_devs != 1) {
-               ret = btrfs_scan_lblkid();
+               ret = btrfs_scan_devices();
                if (ret)
                        return ret;
        }
@@ -1320,8 +1329,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path,
 
        memcpy(fs_info->fsid, &disk_super->fsid, BTRFS_FSID_SIZE);
 
-       ret = btrfs_check_fs_compatibility(fs_info->super_copy,
-                                          flags & OPEN_CTREE_WRITES);
+       ret = btrfs_check_fs_compatibility(fs_info->super_copy, flags);
        if (ret)
                goto out_devices;
 
@@ -1561,7 +1569,7 @@ static int check_super(struct btrfs_super_block *sb, unsigned sbflags)
        }
        if (btrfs_super_sys_array_size(sb) < sizeof(struct btrfs_disk_key)
                        + sizeof(struct btrfs_chunk)) {
-               error("system chunk array too small %u < %lu",
+               error("system chunk array too small %u < %zu",
                      btrfs_super_sys_array_size(sb),
                      sizeof(struct btrfs_disk_key) +
                      sizeof(struct btrfs_chunk));