Skip to contentSkip to conversation

Btrfs fixes for 5.8-rc5, part 2

GIT PULL Merged David Sterba 2 participants 2 messages Jul 12, 2020 Btrfs file system

lore
Share & tools
lore

David Sterba

author maintainer
#0 lore raw

Hi,

please pull two refcounting fixes and one prepartory patch for upcoming splice cleanup. Thanks.

- fix double put of block group with nodatacow

- fix missing block group put when remounting with discard=async

- explicitly set splice callback (no functional change), to ease integrating splice cleanup patches

----------------------------------------------------------------
The following changes since commit 0465337c5599bbe360cdcff452992a1a6b7ed2d4:

btrfs: reset tree root pointer after error in init_tree_roots (2020-07-02 10:27:12 +0200)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-5.8-rc4-tag

for you to fetch changes up to d77765911385b65fc82d74ab71b8983cddfe0b58:

btrfs: wire up iter_file_splice_write (2020-07-09 19:57:58 +0200)

----------------------------------------------------------------
Christoph Hellwig (1):
btrfs: wire up iter_file_splice_write

Josef Bacik (1):
btrfs: fix double put of block group with nocow

Qu Wenruo (1):
btrfs: discard: add missing put when grabbing block group from unused list

 fs/btrfs/discard.c | 1 +
 fs/btrfs/file.c    | 1 +
 fs/btrfs/inode.c   | 9 +--------
 3 files changed, 3 insertions(+), 8 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Sun, 12 Jul 2020 12:14:58 +0200:

The pull request you sent on Sun, 12 Jul 2020 12:14:58 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-5.8-rc4-tag

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/72c34e8d7099c329c2934c2ac9c886f638b6edaf

Thank you!

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