diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-13 13:50:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-13 13:50:11 -0700 |
| commit | 9872e4a8734c68b78e8782e4f7f49e22cd6e9463 (patch) | |
| tree | 8e2fec94ae39a76e617adb032c8ac7ff607f2dde /fs/xfs/libxfs/xfs_trans_resv.c | |
| parent | e140f731f9807035e967c401198171f316744696 (diff) | |
| parent | 031d166f968efba6e4f091ff75d0bb5206bb3918 (diff) | |
| download | linux-9872e4a8734c68b78e8782e4f7f49e22cd6e9463.tar.gz linux-9872e4a8734c68b78e8782e4f7f49e22cd6e9463.tar.bz2 linux-9872e4a8734c68b78e8782e4f7f49e22cd6e9463.zip | |
Merge tag 'xfs-5.20-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull more xfs updates from Darrick Wong:
"There's not a lot this time around, just the usual bug fixes and
corrections for missing error returns.
- Return error codes from block device flushes to userspace
- Fix a deadlock between reclaim and mount time quotacheck
- Fix an unnecessary ENOSPC return when doing COW on a filesystem
with severe free space fragmentation
- Fix a miscalculation in the transaction reservation computations
for file removal operations"
* tag 'xfs-5.20-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
xfs: fix inode reservation space for removing transaction
xfs: Fix false ENOSPC when performing direct write on a delalloc extent in cow fork
xfs: fix intermittent hang during quotacheck
xfs: check return codes when flushing block devices
Diffstat (limited to 'fs/xfs/libxfs/xfs_trans_resv.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_trans_resv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_trans_resv.c b/fs/xfs/libxfs/xfs_trans_resv.c index e9913c2c5a24..2c4ad6e4bb14 100644 --- a/fs/xfs/libxfs/xfs_trans_resv.c +++ b/fs/xfs/libxfs/xfs_trans_resv.c @@ -515,7 +515,7 @@ xfs_calc_remove_reservation( { return XFS_DQUOT_LOGRES(mp) + xfs_calc_iunlink_add_reservation(mp) + - max((xfs_calc_inode_res(mp, 1) + + max((xfs_calc_inode_res(mp, 2) + xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp), XFS_FSB_TO_B(mp, 1))), (xfs_calc_buf_res(4, mp->m_sb.sb_sectsize) + |