btrfs: remove search_commit parameter from btrfs_lookup_csums_list()

All the callers of btrfs_lookup_csums_list() pass a value of 0 as the
"search_commit" parameter. So remove it and make the function behave as
to always search from the regular root.

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/file-item.c b/fs/btrfs/file-item.c
index 909438540119f73ee6a5463df0d87369d7999652..0712a0aa2dd06693d0c127b14ebe2e1ab6ab7513 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -457,15 +457,12 @@ blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio)
  * @start:             Logical address of target checksum range.
  * @end:               End offset (inclusive) of the target checksum range.
  * @list:              List for adding each checksum that was found.
- * @search_commit:     Indicate if the commit root of the @root should be used
- *                     for the search.
  * @nowait:            Indicate if the search must be non-blocking or not.
  *
  * Return < 0 on error and 0 on success.
  */
 int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,
-                           struct list_head *list, int search_commit,
-                           bool nowait)
+                           struct list_head *list, bool nowait)
 {
        struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_key key;
@@ -484,11 +481,6 @@ int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,
                return -ENOMEM;
 
        path->nowait = nowait;
-       if (search_commit) {
-               path->skip_locking = 1;
-               path->reada = READA_FORWARD;
-               path->search_commit_root = 1;
-       }
 
        key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;
        key.offset = start;

diff --git a/fs/btrfs/file-item.h b/fs/btrfs/file-item.h
index 15c05cc0fce60eeeee4103ffebf4c32427042125..557dc43d71422ba5c54bf60974c722bd029b3186 100644 (file)
--- a/fs/btrfs/file-item.h
+++ b/fs/btrfs/file-item.h
@@ -68,8 +68,7 @@ int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
                             struct list_head *list, int search_commit,
                             bool nowait);
 int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,
-                           struct list_head *list, int search_commit,
-                           bool nowait);
+                           struct list_head *list, bool nowait);
 int btrfs_lookup_csums_bitmap(struct btrfs_root *root, struct btrfs_path *path,
                              u64 start, u64 end, u8 *csum_buf,
                              unsigned long *csum_bitmap);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 7c009bbc1a5c88cc9569dc22b4c9913df4fd0784..f4c54596c5c4c79b13c2700d737635e1ac8079d0 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1745,7 +1745,7 @@ static noinline int csum_exist_in_range(struct btrfs_fs_info *fs_info,
        LIST_HEAD(list);
 
        ret = btrfs_lookup_csums_list(csum_root, bytenr, bytenr + num_bytes - 1,
-                                     &list, 0, nowait);
+                                     &list, nowait);
        if (ret == 0 && list_empty(&list))
                return 0;
 

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 5c9ef6717f8450456ec076ef1fce5215f0fd8809..516c6e4610d704a48c6e98daf31e92b84078c565 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -4446,7 +4446,7 @@ int btrfs_reloc_clone_csums(struct btrfs_ordered_extent *ordered)
 
        ret = btrfs_lookup_csums_list(csum_root, disk_bytenr,
                                      disk_bytenr + ordered->num_bytes - 1,
-                                     &list, 0, false);
+                                     &list, false);
        if (ret)
                return ret;
 

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index d9777649e17058c1fe2e0584d5651fa7c99f10e5..079fd0288d9c92611de51b53399c04035fff0b39 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -797,7 +797,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
 
                        ret = btrfs_lookup_csums_list(root->log_root,
                                                csum_start, csum_end - 1,
-                                               &ordered_sums, 0, false);
+                                               &ordered_sums, false);
                        if (ret)
                                goto out;
                        /*
@@ -4460,7 +4460,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,
                disk_bytenr += extent_offset;
                ret = btrfs_lookup_csums_list(csum_root, disk_bytenr,
                                              disk_bytenr + extent_num_bytes - 1,
-                                             &ordered_sums, 0, false);
+                                             &ordered_sums, false);
                if (ret)
                        goto out;
 
@@ -4655,7 +4655,7 @@ static int log_extent_csums(struct btrfs_trans_handle *trans,
        csum_root = btrfs_csum_root(trans->fs_info, em->block_start);
        ret = btrfs_lookup_csums_list(csum_root, em->block_start + csum_offset,
                                      em->block_start + csum_offset +
-                                     csum_len - 1, &ordered_sums, 0, false);
+                                     csum_len - 1, &ordered_sums, false);
        if (ret)
                return ret;