Skip to contentSkip to conversation

Btrfs fixes for 5.15-rc6

GIT PULL Merged David Sterba 4 participants 4 messages Oct 11, 2021 – Oct 12, 2021 Btrfs file system

lore
Share & tools
lore

David Sterba

author maintainer
#0 lore raw

Hi,

a few more error handling fixes, stemming from code inspection, error injection or fuzzing. Please pull, thanks.

----------------------------------------------------------------
The following changes since commit 0619b7901473c380abc05d45cf9c70bee0707db3:

btrfs: prevent __btrfs_dump_space_info() to underflow its free space (2021-09-17 19:29:54 +0200)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-5.15-rc5-tag

for you to fetch changes up to 4afb912f439c4bc4e6a4f3e7547f2e69e354108f:

btrfs: fix abort logic in btrfs_replace_file_extents (2021-10-07 22:08:06 +0200)

----------------------------------------------------------------
Filipe Manana (5):
btrfs: deal with errors when checking if a dir entry exists during log replay
btrfs: deal with errors when replaying dir entry during log replay
btrfs: deal with errors when adding inode reference during log replay
btrfs: unify lookup return value when dir entry is missing
btrfs: check for error when looking up inode during dir entry replay

Josef Bacik (2):
btrfs: update refs for any root except tree log roots
btrfs: fix abort logic in btrfs_replace_file_extents

Qu Wenruo (1):
btrfs: unlock newly allocated extent buffer after error

 fs/btrfs/ctree.h       |  2 +-
 fs/btrfs/dir-item.c    | 48 +++++++++++++++++++++++-------
 fs/btrfs/extent-tree.c |  1 +
 fs/btrfs/file.c        | 19 ++++++------
 fs/btrfs/tree-log.c    | 79 ++++++++++++++++++++++++++++++--------------------
 5 files changed, 97 insertions(+), 52 deletions(-)
#1 lore raw
Quoted 2 lines · David Sterba

git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-5.15-rc5-tag

I see the 'for-5.15-rc5' _branch_, but there is no tag there.

Did you forget to push that out?

Linus

#2 lore raw
Quoted 7 lines · Linus Torvalds
Quoted 2 lines · David Sterba

git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-5.15-rc5-tag

I see the 'for-5.15-rc5' _branch_, but there is no tag there.

Did you forget to push that out?

Ah sorry, yes, I even forgot to create the tag. Now it's there.

merge bot Merged
#3 lore raw
In reply to David Sterba
The pull request you sent on Mon, 11 Oct 2021 20:40:10 +0200:

The pull request you sent on Mon, 11 Oct 2021 20:40:10 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-5.15-rc5-tag

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1986c10acc9c906e453fb19d86e6342e8e525824

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html