Skip to contentSkip to conversation

btrfs: tests: Use BTRFS_MAX_EXTENT_SIZE to replace the intermediate number

PATCH In review Qu Wenruo 3 participants 3 messages Nov 3, 2018 – Nov 5, 2018 Btrfs file system

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

PATCH 1/1 btrfs: tests: Use BTRFS_MAX_EXTENT_SIZE to replace the intermediate number

In extent-io self test, we need 2 ordered extents at its maximum size to do the test.

Instead of using the intermediate numbers, use BTRFS_MAX_EXTENT_SIZE for @max_bytes, and twice @max_bytes for @total_dirty.
This should explain why we need all these magic numbers and prevent people to modify them by accident.

---
 fs/btrfs/tests/extent-io-tests.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
fs/btrfs/tests/extent-io-tests.c +3 -2
index 9e0f4a01be14..c0ad9bc48f6b 100644
@@ -62,8 +62,9 @@ static int test_find_delalloc(u32 sectorsize)
 	struct page *page;
 	struct page *locked_page = NULL;
 	unsigned long index = 0;
-	u64 total_dirty = SZ_256M;
-	u64 max_bytes = SZ_128M;
+	/* In this test we need at least 2 file extents at its maximum size */
+	u64 max_bytes = BTRFS_MAX_EXTENT_SIZE;
+	u64 total_dirty = 2 * max_bytes;
 	u64 start, end, test_start;
 	u64 found;
 	int ret = -EINVAL;
Signature · 1 line
2.19.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Qu Wenruo

In extent-io self test, we need 2 ordered extents at its maximum size to do the test.

Instead of using the intermediate numbers, use BTRFS_MAX_EXTENT_SIZE for @max_bytes, and twice @max_bytes for @total_dirty.
This should explain why we need all these magic numbers and prevent people to modify them by accident.

Quoted 21 lines
---
 fs/btrfs/tests/extent-io-tests.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
fs/btrfs/tests/extent-io-tests.c +3 -2
index 9e0f4a01be14..c0ad9bc48f6b 100644
@@ -62,8 +62,9 @@ static int test_find_delalloc(u32 sectorsize)
 	struct page *page;
 	struct page *locked_page = NULL;
 	unsigned long index = 0;
-	u64 total_dirty = SZ_256M;
-	u64 max_bytes = SZ_128M;
+	/* In this test we need at least 2 file extents at its maximum size */
+	u64 max_bytes = BTRFS_MAX_EXTENT_SIZE;
+	u64 total_dirty = 2 * max_bytes;
 	u64 start, end, test_start;
 	u64 found;
 	int ret = -EINVAL;
#2 lore raw
In reply to Qu Wenruo
Quoted 9 lines · Qu Wenruo

In extent-io self test, we need 2 ordered extents at its maximum size to do the test.

Instead of using the intermediate numbers, use BTRFS_MAX_EXTENT_SIZE for @max_bytes, and twice @max_bytes for @total_dirty.
This should explain why we need all these magic numbers and prevent people to modify them by accident.

Added to misc-next, thanks.