Skip to contentSkip to conversation

Btrfs fixes for 6.7-rc6

GIT PULL Merged David Sterba 2 participants 2 messages Dec 13, 2023 – Dec 14, 2023 Btrfs file system

lore
Share & tools
lore

David Sterba

author maintainer
#0 lore raw

Hi,

there are some fixes to quota accounting code, mostly around error handling and correctness. Please pull, thanks.

- free reserves on various error paths, after IO errors or transaction abort

- don't clear reserved range at the folio release time, it'll be properly cleared after final write

- fix integer overflow due to int used when passing around size of freed reservations

- fix a regression in squota accounting that missed some cases with delayed refs

----------------------------------------------------------------
The following changes since commit 0ac1d13a55eb37d398b63e6ff6db4a09a2c9128c:

btrfs: send: ensure send_fd is writable (2023-11-24 18:50:53 +0100)

are available in the Git repository at:

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

for you to fetch changes up to e85a0adacf170634878fffcbf34b725aff3f49ed:

btrfs: ensure releasing squota reserve on head refs (2023-12-06 22:32:57 +0100)

----------------------------------------------------------------
Boris Burkov (5):
btrfs: free qgroup reserve when ORDERED_IOERR is set
btrfs: fix qgroup_free_reserved_data int overflow
btrfs: free qgroup pertrans reserve on transaction abort
btrfs: don't clear qgroup reserved bit in release_folio
btrfs: ensure releasing squota reserve on head refs

 fs/btrfs/delalloc-space.c |  2 +-
 fs/btrfs/disk-io.c        | 28 +++++++++++++++++++++++++++
 fs/btrfs/extent-tree.c    | 48 +++++++++++++++++++++++++++++++++--------------
 fs/btrfs/extent_io.c      |  3 ++-
 fs/btrfs/file.c           |  2 +-
 fs/btrfs/inode.c          | 16 ++++++++--------
 fs/btrfs/ordered-data.c   | 11 +++++++----
 fs/btrfs/qgroup.c         | 44 ++++++++++++++++++++++++++++---------------
 fs/btrfs/qgroup.h         |  7 +++----
 fs/btrfs/transaction.c    |  2 --
 fs/btrfs/transaction.h    |  3 +++
 11 files changed, 116 insertions(+), 50 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Wed, 13 Dec 2023 14:26:37 +0100:

The pull request you sent on Wed, 13 Dec 2023 14:26:37 +0100:

Quoted 1 line

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

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

Thank you!

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