46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
|
From ebd6cdd32653b6f44ca270ea08571fb4fe1ad85f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Brian Foster <bfoster@redhat.com>
|
||
|
|
Date: Fri, 4 Sep 2020 16:01:20 -0400
|
||
|
|
Subject: [PATCH 10/16] xfs: fix inode allocation block res calculation
|
||
|
|
precedence
|
||
|
|
|
||
|
|
Source kernel commit: b2a8864728683443f34a9fd33a2b78b860934cc1
|
||
|
|
|
||
|
|
The block reservation calculation for inode allocation is supposed
|
||
|
|
to consist of the blocks required for the inode chunk plus
|
||
|
|
(maxlevels-1) of the inode btree multiplied by the number of inode
|
||
|
|
btrees in the fs (2 when finobt is enabled, 1 otherwise).
|
||
|
|
|
||
|
|
Instead, the macro returns (ialloc_blocks + 2) due to a precedence
|
||
|
|
error in the calculation logic. This leads to block reservation
|
||
|
|
overruns via generic/531 on small block filesystems with finobt
|
||
|
|
enabled. Add braces to fix the calculation and reserve the
|
||
|
|
appropriate number of blocks.
|
||
|
|
|
||
|
|
Fixes: 9d43b180af67 ("xfs: update inode allocation/free transaction reservations for finobt")
|
||
|
|
Signed-off-by: Brian Foster <bfoster@redhat.com>
|
||
|
|
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
|
||
|
|
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
|
||
|
|
Reviewed-by: Christoph Hellwig <hch@lst.de>
|
||
|
|
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
|
||
|
|
---
|
||
|
|
libxfs/xfs_trans_space.h | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/libxfs/xfs_trans_space.h b/libxfs/xfs_trans_space.h
|
||
|
|
index 88221c7..c6df01a 100644
|
||
|
|
--- a/libxfs/xfs_trans_space.h
|
||
|
|
+++ b/libxfs/xfs_trans_space.h
|
||
|
|
@@ -57,7 +57,7 @@
|
||
|
|
XFS_DAREMOVE_SPACE_RES(mp, XFS_DATA_FORK)
|
||
|
|
#define XFS_IALLOC_SPACE_RES(mp) \
|
||
|
|
(M_IGEO(mp)->ialloc_blks + \
|
||
|
|
- (xfs_sb_version_hasfinobt(&mp->m_sb) ? 2 : 1 * \
|
||
|
|
+ ((xfs_sb_version_hasfinobt(&mp->m_sb) ? 2 : 1) * \
|
||
|
|
(M_IGEO(mp)->inobt_maxlevels - 1)))
|
||
|
|
|
||
|
|
/*
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|