From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Oct 2021 23:48:19 +0000 (-0700)
Subject: Merge tag 'for-5.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~6200
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1986c10acc9c906e453fb19d86e6342e8e525824;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'for-5.15-rc5-tag' of git://git./linux/kernel/git/kdave/linux

Pull btrfs fixes from David Sterba:
 "A few more error handling fixes, stemming from code inspection, error
  injection or fuzzing"

* tag 'for-5.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: fix abort logic in btrfs_replace_file_extents
  btrfs: check for error when looking up inode during dir entry replay
  btrfs: unify lookup return value when dir entry is missing
  btrfs: deal with errors when adding inode reference during log replay
  btrfs: deal with errors when replaying dir entry during log replay
  btrfs: deal with errors when checking if a dir entry exists during log replay
  btrfs: update refs for any root except tree log roots
  btrfs: unlock newly allocated extent buffer after error
---

1986c10acc9c906e453fb19d86e6342e8e525824