Commit 5619b098 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-7.0-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs fix from David Sterba:
 "One more fix for a potential extent tree corruption due to an
  unexpected error value.

  When the search for an extent item failed, it under some circumstances
  was reported as a success to the caller"

* tag 'for-7.0-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: fix incorrect return value after changing leaf in lookup_extent_data_ref()
parents f8f5627a 316fb1b3

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static noinline int lookup_extent_data_ref(struct btrfs_trans_handle *trans, 
		btrfs_item_key_to_cpu(leaf, &key, path->slots[0]);

		if (key.objectid != bytenr ||

		    key.type != BTRFS_EXTENT_DATA_REF_KEY)

			return ret;

			return -ENOENT;



		ref = btrfs_item_ptr(leaf, path->slots[0],

				     struct btrfs_extent_data_ref);