Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f56aa0b authored by Brian Foster's avatar Brian Foster Committed by Greg Kroah-Hartman
Browse files

xfs: fix inode allocation block res calculation precedence 



[ Upstream 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: 9d43b180 ("xfs: update inode allocation/free transaction reservations for finobt")
Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5c0fd1e6

fs/xfs/libxfs/xfs_trans_space.h

+1 −1
Original line number Diff line number Diff line
@@ -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)))



/*