btrfs: use clear_extent_bits() instead of clear_extent_bit() where possible

Several places are using clear_extent_bit() and passing a NULL value for
the 'cached' argument, which is pointless as they can use instead
clear_extent_bits().

Reviewed-by: Boris Burkov <boris@bur.io>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 7b24420e0c5a9a5562d93b48ecf7cf7d1dd69960..dcf79c2fad9bb86a99803f6802592735bb3de200 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1757,8 +1757,7 @@ static int fallback_to_cow(struct btrfs_inode *inode,
                spin_unlock(&sinfo->lock);
 
                if (count > 0)
-                       clear_extent_bit(io_tree, start, end, EXTENT_NORESERVE,
-                                        NULL);
+                       clear_extent_bits(io_tree, start, end, EXTENT_NORESERVE);
        }
        unlock_extent(io_tree, start, end, &cached_state);
 

diff --git a/fs/btrfs/reflink.c b/fs/btrfs/reflink.c
index 15c296cb4dacc34068fff3a7b18c0315ed04c679..09e40a2fdcf00455b7871083133e6b928d60ba5a 100644 (file)
--- a/fs/btrfs/reflink.c
+++ b/fs/btrfs/reflink.c
@@ -95,9 +95,8 @@ static int copy_inline_to_page(struct btrfs_inode *inode,
        if (ret < 0)
                goto out_unlock;
 
-       clear_extent_bit(&inode->io_tree, file_offset, range_end,
-                        EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,
-                        NULL);
+       clear_extent_bits(&inode->io_tree, file_offset, range_end,
+                         EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG);
        ret = btrfs_set_extent_delalloc(inode, file_offset, range_end, 0, NULL);
        if (ret)
                goto out_unlock;

diff --git a/fs/btrfs/tests/inode-tests.c b/fs/btrfs/tests/inode-tests.c
index 8142a84129b60ad4e8ea6e7cc89b4ae7aae115fb..09ba6e279d245bb2a6c1a02daca8f51dfedec476 100644 (file)
--- a/fs/btrfs/tests/inode-tests.c
+++ b/fs/btrfs/tests/inode-tests.c
@@ -949,10 +949,10 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)
        }
 
        /* [BTRFS_MAX_EXTENT_SIZE/2][sectorsize HOLE][the rest] */
-       ret = clear_extent_bit(&BTRFS_I(inode)->io_tree,
-                              BTRFS_MAX_EXTENT_SIZE >> 1,
-                              (BTRFS_MAX_EXTENT_SIZE >> 1) + sectorsize - 1,
-                              EXTENT_DELALLOC | EXTENT_DELALLOC_NEW, NULL);
+       ret = clear_extent_bits(&BTRFS_I(inode)->io_tree,
+                               BTRFS_MAX_EXTENT_SIZE >> 1,
+                               (BTRFS_MAX_EXTENT_SIZE >> 1) + sectorsize - 1,
+                               EXTENT_DELALLOC | EXTENT_DELALLOC_NEW);
        if (ret) {
                test_err("clear_extent_bit returned %d", ret);
                goto out;
@@ -1016,10 +1016,10 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)
        }
 
        /* [BTRFS_MAX_EXTENT_SIZE+4k][4K HOLE][BTRFS_MAX_EXTENT_SIZE+4k] */
-       ret = clear_extent_bit(&BTRFS_I(inode)->io_tree,
-                              BTRFS_MAX_EXTENT_SIZE + sectorsize,
-                              BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1,
-                              EXTENT_DELALLOC | EXTENT_DELALLOC_NEW, NULL);
+       ret = clear_extent_bits(&BTRFS_I(inode)->io_tree,
+                               BTRFS_MAX_EXTENT_SIZE + sectorsize,
+                               BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1,
+                               EXTENT_DELALLOC | EXTENT_DELALLOC_NEW);
        if (ret) {
                test_err("clear_extent_bit returned %d", ret);
                goto out;
@@ -1050,8 +1050,8 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)
        }
 
        /* Empty */
-       ret = clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, (u64)-1,
-                              EXTENT_DELALLOC | EXTENT_DELALLOC_NEW, NULL);
+       ret = clear_extent_bits(&BTRFS_I(inode)->io_tree, 0, (u64)-1,
+                               EXTENT_DELALLOC | EXTENT_DELALLOC_NEW);
        if (ret) {
                test_err("clear_extent_bit returned %d", ret);
                goto out;
@@ -1065,8 +1065,8 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)
        ret = 0;
 out:
        if (ret)
-               clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, (u64)-1,
-                                EXTENT_DELALLOC | EXTENT_DELALLOC_NEW, NULL);
+               clear_extent_bits(&BTRFS_I(inode)->io_tree, 0, (u64)-1,
+                                 EXTENT_DELALLOC | EXTENT_DELALLOC_NEW);
        iput(inode);
        btrfs_free_dummy_root(root);
        btrfs_free_dummy_fs_info(fs_info);