Skip to contentSkip to conversation

Btrfs fixes for 5.4-rc5

GIT PULL Merged David Sterba 3 participants 3 messages Oct 22, 2019 – Oct 23, 2019 Btrfs file system

lore
Share & tools
lore

David Sterba

author maintainer
#0 lore raw

Hi,

please pull the following updates, all stable material. Thanks.

Changes:

* fixes of error handling cleanup of metadata accounting with qgroups enabled

* fix swapped values for qgroup tracepoints

* fix during file sync, the full-sync status might get dropped externally, eg. by background witeback under some circumstances

* don't start unused worker thread, functionality removed already

----------------------------------------------------------------
The following changes since commit 431d39887d6273d6d84edf3c2eab09f4200e788a:

btrfs: silence maybe-uninitialized warning in clone_range (2019-10-08 13:14:55 +0200)

are available in the Git repository at:

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

for you to fetch changes up to ba0b084ac309283db6e329785c1dc4f45fdbd379:

Btrfs: check for the full sync flag while holding the inode lock during fsync (2019-10-17 20:36:02 +0200)

----------------------------------------------------------------
David Sterba (1):
btrfs: don't needlessly create extent-refs kernel thread

Filipe Manana (3):
Btrfs: add missing extents release on file extent cluster relocation error
Btrfs: fix qgroup double free after failure to reserve metadata for delalloc
Btrfs: check for the full sync flag while holding the inode lock during fsync

Qu Wenruo (4):
btrfs: block-group: Fix a memory leak due to missing btrfs_put_block_group()
btrfs: qgroup: Always free PREALLOC META reserve in btrfs_delalloc_release_extents()
btrfs: tracepoints: Fix wrong parameter order for qgroup events
btrfs: tracepoints: Fix bad entry members of qgroup events

 fs/btrfs/block-group.c       |  1 +
 fs/btrfs/ctree.h             |  5 +----
 fs/btrfs/delalloc-space.c    |  7 ++-----
 fs/btrfs/disk-io.c           |  6 ------
 fs/btrfs/file.c              | 43 ++++++++++++++++++++-----------------------
 fs/btrfs/inode-map.c         |  4 ++--
 fs/btrfs/inode.c             | 12 ++++++------
 fs/btrfs/ioctl.c             |  6 ++----
 fs/btrfs/qgroup.c            |  4 ++--
 fs/btrfs/relocation.c        |  9 +++++----
 include/trace/events/btrfs.h |  3 ++-
 11 files changed, 43 insertions(+), 57 deletions(-)
#1 lore raw
Quoted 2 lines · David Sterba

* fix during file sync, the full-sync status might get dropped externally, eg. by background witeback under some circumstances

Please replace the above merge log entry with

* fix race when handling full sync flag

The above wording was wrong and misleading, the changelog has all the deatils and my attempt to condense it did not work very well. Thanks.

merge bot Merged
#2 lore raw
In reply to David Sterba
The pull request you sent on Tue, 22 Oct 2019 15:52:07 +0200:

The pull request you sent on Tue, 22 Oct 2019 15:52:07 +0200:

Quoted 1 line

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

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/54955e3bfde54dcdd29694741f2ddfc6b763b193

Thank you!

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