btrfs: remove always true if branch in find_delalloc_range

[sfrench/cifs-2.6.git] / fs / btrfs / tests / extent-io-tests.c

diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c
index 9e0f4a01be14a93311987e25e29fe39ee484c518..3c46d7f2345663fc384e1e7fcbfdb968d5410952 100644 (file)
--- a/fs/btrfs/tests/extent-io-tests.c
+++ b/fs/btrfs/tests/extent-io-tests.c
@@ -62,10 +62,11 @@ 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;
+       bool found;
        int ret = -EINVAL;
 
        test_msg("running find delalloc tests");
@@ -76,7 +77,7 @@ static int test_find_delalloc(u32 sectorsize)
                return -ENOMEM;
        }
 
-       extent_io_tree_init(&tmp, inode);
+       extent_io_tree_init(&tmp, NULL);
 
        /*
         * First go through and create and mark all of our pages dirty, we pin
@@ -106,8 +107,8 @@ static int test_find_delalloc(u32 sectorsize)
        set_extent_delalloc(&tmp, 0, sectorsize - 1, 0, NULL);
        start = 0;
        end = 0;
-       found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start,
-                                        &end, max_bytes);
+       found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
+                                        &end);
        if (!found) {
                test_err("should have found at least one delalloc");
                goto out_bits;
@@ -137,8 +138,8 @@ static int test_find_delalloc(u32 sectorsize)
        set_extent_delalloc(&tmp, sectorsize, max_bytes - 1, 0, NULL);
        start = test_start;
        end = 0;
-       found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start,
-                                        &end, max_bytes);
+       found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
+                                        &end);
        if (!found) {
                test_err("couldn't find delalloc in our range");
                goto out_bits;
@@ -171,8 +172,8 @@ static int test_find_delalloc(u32 sectorsize)
        }
        start = test_start;
        end = 0;
-       found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start,
-                                        &end, max_bytes);
+       found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
+                                        &end);
        if (found) {
                test_err("found range when we shouldn't have");
                goto out_bits;
@@ -192,8 +193,8 @@ static int test_find_delalloc(u32 sectorsize)
        set_extent_delalloc(&tmp, max_bytes, total_dirty - 1, 0, NULL);
        start = test_start;
        end = 0;
-       found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start,
-                                        &end, max_bytes);
+       found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
+                                        &end);
        if (!found) {
                test_err("didn't find our range");
                goto out_bits;
@@ -233,8 +234,8 @@ static int test_find_delalloc(u32 sectorsize)
         * this changes at any point in the future we will need to fix this
         * tests expected behavior.
         */
-       found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start,
-                                        &end, max_bytes);
+       found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
+                                        &end);
        if (!found) {
                test_err("didn't find our range");
                goto out_bits;