Commit d3fb6615 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

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: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 8e81aa16

fs/btrfs/extent-tree.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

		}