Re: [PATCH 3/3] btrfs: Refactor parameter of BTRFS_MAX_DEVS() from root to fs_info

[Nikolay Borisov]

On 30.01.2018 09:40, Qu Wenruo wrote:
> Signed-off-by: Qu Wenruo 

Reviewed-by: Nikolay Borisov 


> ---
>  fs/btrfs/volumes.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index d818b1f9c625..215e85e22c8e 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -4581,7 +4581,7 @@ static void check_raid56_incompat_flag(struct 
> btrfs_fs_info *info, u64 type)
>   btrfs_set_fs_incompat(info, RAID56);
>  }
>  
> -#define BTRFS_MAX_DEVS(r) ((BTRFS_MAX_ITEM_SIZE(r->fs_info)  \
> +#define BTRFS_MAX_DEVS(info) ((BTRFS_MAX_ITEM_SIZE(info) \
>   - sizeof(struct btrfs_chunk))   \
>   / sizeof(struct btrfs_stripe) + 1)
>  
> @@ -4638,7 +4638,7 @@ static int __btrfs_alloc_chunk(struct 
> btrfs_trans_handle *trans,
>   max_stripe_size = SZ_1G;
>   max_chunk_size = 10 * max_stripe_size;
>   if (!devs_max)
> - devs_max = BTRFS_MAX_DEVS(info->chunk_root);
> + devs_max = BTRFS_MAX_DEVS(info);
>   } else if (type & BTRFS_BLOCK_GROUP_METADATA) {
>   /* for larger filesystems, use larger metadata chunks */
>   if (fs_devices->total_rw_bytes > 50ULL * SZ_1G)
> @@ -4647,7 +4647,7 @@ static int __btrfs_alloc_chunk(struct 
> btrfs_trans_handle *trans,
>   max_stripe_size = SZ_256M;
>   max_chunk_size = max_stripe_size;
>   if (!devs_max)
> - devs_max = BTRFS_MAX_DEVS(info->chunk_root);
> + devs_max = BTRFS_MAX_DEVS(info);
>   } else if (type & BTRFS_BLOCK_GROUP_SYSTEM) {
>   max_stripe_size = SZ_32M;
>   max_chunk_size = 2 * max_stripe_size;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 3/3] btrfs: Refactor parameter of BTRFS_MAX_DEVS() from root to fs_info

[Anand Jain]

On 01/30/2018 03:40 PM, Qu Wenruo wrote:

Signed-off-by: Qu Wenruo 


Reviewed-by: Anand Jain 

Thanks, Anand


---
  fs/btrfs/volumes.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index d818b1f9c625..215e85e22c8e 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -4581,7 +4581,7 @@ static void check_raid56_incompat_flag(struct 
btrfs_fs_info *info, u64 type)
btrfs_set_fs_incompat(info, RAID56);
  }
  
-#define BTRFS_MAX_DEVS(r) ((BTRFS_MAX_ITEM_SIZE(r->fs_info)		\

+#define BTRFS_MAX_DEVS(info) ((BTRFS_MAX_ITEM_SIZE(info)   \
- sizeof(struct btrfs_chunk))   \
/ sizeof(struct btrfs_stripe) + 1)
  
@@ -4638,7 +4638,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,

max_stripe_size = SZ_1G;
max_chunk_size = 10 * max_stripe_size;
if (!devs_max)
-   devs_max = BTRFS_MAX_DEVS(info->chunk_root);
+   devs_max = BTRFS_MAX_DEVS(info);
} else if (type & BTRFS_BLOCK_GROUP_METADATA) {
/* for larger filesystems, use larger metadata chunks */
if (fs_devices->total_rw_bytes > 50ULL * SZ_1G)
@@ -4647,7 +4647,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle 
*trans,
max_stripe_size = SZ_256M;
max_chunk_size = max_stripe_size;
if (!devs_max)
-   devs_max = BTRFS_MAX_DEVS(info->chunk_root);
+   devs_max = BTRFS_MAX_DEVS(info);
} else if (type & BTRFS_BLOCK_GROUP_SYSTEM) {
max_stripe_size = SZ_32M;
max_chunk_size = 2 * max_stripe_size;


--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html