btrfs: replace BTRFS_MAX_EXTENT_SIZE with fs_info->max_extent_size

author Naohiro Aota <naohiro.aota@wdc.com>

Fri, 8 Jul 2022 23:18:40 +0000 (08:18 +0900)

committer David Sterba <dsterba@suse.com>

Mon, 25 Jul 2022 15:45:41 +0000 (17:45 +0200)
author Naohiro Aota <naohiro.aota@wdc.com>
Fri, 8 Jul 2022 23:18:40 +0000 (08:18 +0900)
committer David Sterba <dsterba@suse.com>
Mon, 25 Jul 2022 15:45:41 +0000 (17:45 +0200)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h

index b2a161227ac518ec098bb33d25f0911cd9651c0f..0ca83f72dbd9ddfbfd38617d868f0cf89ef0bf50 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1055,6 +1055,12 @@ struct btrfs_fs_info {
         u32 csums_per_leaf;
         u32 stripesize;
  
+       /*
+        * Maximum size of an extent. BTRFS_MAX_EXTENT_SIZE on regular
+        * filesystem, on zoned it depends on the device constraints.
+        */
+       u64 max_extent_size;
+
         /* Block groups and devices containing active swapfiles. */
         spinlock_t swapfile_pins_lock;
         struct rb_root swapfile_pins;
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c

index 494e55ed3709919401044b17cebe55047a078dfb..90e513e54b48d579994e1a3c5de7eb75ed94bdd7 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3159,6 +3159,8 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info)
         fs_info->sectorsize_bits = ilog2(4096);
         fs_info->stripesize = 4096;
  
+       fs_info->max_extent_size = BTRFS_MAX_EXTENT_SIZE;
+
         spin_lock_init(&fs_info->swapfile_pins_lock);
         fs_info->swapfile_pins = RB_ROOT;
  
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c

index 70fc7a65092422a86521ed682424f2751e508953..fb09b83e2ab489ed1662dc58c8ebd752dc72a984 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2021,10 +2021,12 @@ noinline_for_stack bool find_lock_delalloc_range(struct inode *inode,
                                     struct page *locked_page, u64 *start,
                                     u64 *end)
  {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
         struct extent_io_tree *tree = &BTRFS_I(inode)->io_tree;
         const u64 orig_start = *start;
         const u64 orig_end = *end;
-       u64 max_bytes = BTRFS_MAX_EXTENT_SIZE;
+       /* The sanity tests may not set a valid fs_info. */
+       u64 max_bytes = fs_info ? fs_info->max_extent_size : BTRFS_MAX_EXTENT_SIZE;
         u64 delalloc_start;
         u64 delalloc_end;
         bool found;
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c

index b26bb73d9b33c07e3ac8e3ad028d3c1db9809417..abf5fca26e2c5ebf9ff1926343fd6f23c1c82259 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2201,6 +2201,7 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct page *locked_page
  void btrfs_split_delalloc_extent(struct inode *inode,
                                  struct extent_state *orig, u64 split)
  {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
         u64 size;
  
         /* not delalloc, ignore it */
@@ -2208,7 +2209,7 @@ void btrfs_split_delalloc_extent(struct inode *inode,
                 return;
  
         size = orig->end - orig->start + 1;
-       if (size > BTRFS_MAX_EXTENT_SIZE) {
+       if (size > fs_info->max_extent_size) {
                 u32 num_extents;
                 u64 new_size;
  
@@ -2237,6 +2238,7 @@ void btrfs_split_delalloc_extent(struct inode *inode,
  void btrfs_merge_delalloc_extent(struct inode *inode, struct extent_state *new,
                                  struct extent_state *other)
  {
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
         u64 new_size, old_size;
         u32 num_extents;
  
@@ -2250,7 +2252,7 @@ void btrfs_merge_delalloc_extent(struct inode *inode, struct extent_state *new,
                 new_size = other->end - new->start + 1;
  
         /* we're not bigger than the max, unreserve the space and go */
-       if (new_size <= BTRFS_MAX_EXTENT_SIZE) {
+       if (new_size <= fs_info->max_extent_size) {
                 spin_lock(&BTRFS_I(inode)->lock);
                 btrfs_mod_outstanding_extents(BTRFS_I(inode), -1);
                 spin_unlock(&BTRFS_I(inode)->lock);
diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c

index bdc533fa80ae68b8d28358faa3fbef2074e0607c..d8a0a522b3cad7d6c2924667423c73772732f881 100644 (file)
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -739,8 +739,11 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)
         }
  
         fs_info->zone_size = zone_size;
-       fs_info->max_zone_append_size = max_zone_append_size;
+       fs_info->max_zone_append_size = ALIGN_DOWN(max_zone_append_size,
+                                                  fs_info->sectorsize);
         fs_info->fs_devices->chunk_alloc_policy = BTRFS_CHUNK_ALLOC_ZONED;
+       if (fs_info->max_zone_append_size < fs_info->max_extent_size)
+               fs_info->max_extent_size = fs_info->max_zone_append_size;
  
         /*
          * Check mount options here, because we might change fs_info->zoned
author	Naohiro Aota <naohiro.aota@wdc.com>
	Fri, 8 Jul 2022 23:18:40 +0000 (08:18 +0900)
committer	David Sterba <dsterba@suse.com>
	Mon, 25 Jul 2022 15:45:41 +0000 (17:45 +0200)
fs/btrfs/ctree.h		patch \| blob \| history
fs/btrfs/disk-io.c		patch \| blob \| history
fs/btrfs/extent_io.c		patch \| blob \| history
fs/btrfs/inode.c		patch \| blob \| history
fs/btrfs/zoned.c		patch \| blob \| history