btrfs: add free space tree to lockdep classes

[mirror_ubuntu-bionic-kernel.git] / fs / btrfs / ctree.c

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 5b8e235c4b6d6299183ebba91976f0d53612c16c..769e0ff1b4cebe998cc29f567d6fae73be4b8fb0 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1555,7 +1555,7 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans,
                return 0;
        }
 
-       search_start = buf->start & ~((u64)(1024 * 1024 * 1024) - 1);
+       search_start = buf->start & ~((u64)SZ_1G - 1);
 
        if (parent)
                btrfs_set_lock_blocking(parent);
@@ -2248,7 +2248,6 @@ static void reada_for_search(struct btrfs_root *root,
        u64 target;
        u64 nread = 0;
        u64 gen;
-       int direction = path->reada;
        struct extent_buffer *eb;
        u32 nr;
        u32 blocksize;
@@ -2276,16 +2275,16 @@ static void reada_for_search(struct btrfs_root *root,
        nr = slot;
 
        while (1) {
-               if (direction < 0) {
+               if (path->reada == READA_BACK) {
                        if (nr == 0)
                                break;
                        nr--;
-               } else if (direction > 0) {
+               } else if (path->reada == READA_FORWARD) {
                        nr++;
                        if (nr >= nritems)
                                break;
                }
-               if (path->reada < 0 && objectid) {
+               if (path->reada == READA_BACK && objectid) {
                        btrfs_node_key(node, &disk_key, nr);
                        if (btrfs_disk_key_objectid(&disk_key) != objectid)
                                break;
@@ -2493,7 +2492,7 @@ read_block_for_search(struct btrfs_trans_handle *trans,
        btrfs_set_path_blocking(p);
 
        free_extent_buffer(tmp);
-       if (p->reada)
+       if (p->reada != READA_NONE)
                reada_for_search(root, p, level, slot, key->objectid);
 
        btrfs_release_path(p);