X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=fs%2Fbtrfs%2Fvolumes.c;h=b9ef6f54635ca5c45c3266e02e1ea7f745775c24;hb=7cf4bea77ab60742c128c2ceb4b1b8078887b823;hp=5a5a8d488a7bcd042175ca7499bea3a3c7d84ff4;hpb=acfdcaeed6e6b954f5b99210b8f05cbc18200945;p=sfrench%2Fcifs-2.6.git

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 5a5a8d488a7b..b9ef6f54635c 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -5109,7 +5109,7 @@ static void init_alloc_chunk_ctl_policy_regular(
 	ASSERT(space_info);
 
 	ctl->max_chunk_size = READ_ONCE(space_info->chunk_size);
-	ctl->max_stripe_size = ctl->max_chunk_size;
+	ctl->max_stripe_size = min_t(u64, ctl->max_chunk_size, SZ_1G);
 
 	if (ctl->type & BTRFS_BLOCK_GROUP_SYSTEM)
 		ctl->devs_max = min_t(int, ctl->devs_max, BTRFS_MAX_DEVS_SYS_CHUNK);