btrfs: always lock the block before calling btrfs_clean_tree_block

We want to clean up the dirty handling for extent buffers so it's a
little more consistent, so skip the check for generation == transid and
simply always lock the extent buffer before calling btrfs_clean_tree_block.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 688cdf816957be662a9f985d979a530167075110..97f2c10ad654025d888eb0bfe6a13f18bbe0ef5c 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5469,8 +5469,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
                        }
                }
                /* make block locked assertion in btrfs_clean_tree_block happy */
-               if (!path->locks[level] &&
-                   btrfs_header_generation(eb) == trans->transid) {
+               if (!path->locks[level]) {
                        btrfs_tree_lock(eb);
                        path->locks[level] = BTRFS_WRITE_LOCK;
                }