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

Commit 3a895cc0 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Greg Kroah-Hartman
Browse files

xfs: rename m_inotbt_nores to m_finobt_nores 



commit e1f6ca11381588e3ef138c10de60eeb34cb8466a upstream.

Rename this flag variable to imply more strongly that it's related to
the free inode btree (finobt) operation.  No functional changes.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Suggested-by: default avatarAmir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2ab62234

fs/xfs/libxfs/xfs_ag_resv.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ xfs_ag_resv_init( 
			 */

			ask = used = 0;



			mp->m_inotbt_nores = true;

			mp->m_finobt_nores = true;



			error = xfs_refcountbt_calc_reserves(mp, tp, agno, &ask,

					&used);

fs/xfs/libxfs/xfs_ialloc_btree.c

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ xfs_finobt_alloc_block( 
	union xfs_btree_ptr	*new,

	int			*stat)

{

	if (cur->bc_mp->m_inotbt_nores)

	if (cur->bc_mp->m_finobt_nores)

		return xfs_inobt_alloc_block(cur, start, new, stat);

	return __xfs_inobt_alloc_block(cur, start, new, stat,

			XFS_AG_RESV_METADATA);
@@ -157,7 +157,7 @@ xfs_finobt_free_block( 
	struct xfs_btree_cur	*cur,

	struct xfs_buf		*bp)

{

	if (cur->bc_mp->m_inotbt_nores)

	if (cur->bc_mp->m_finobt_nores)

		return xfs_inobt_free_block(cur, bp);

	return __xfs_inobt_free_block(cur, bp, XFS_AG_RESV_METADATA);

}

fs/xfs/xfs_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1754,7 +1754,7 @@ xfs_inactive_ifree( 
	 * now remains allocated and sits on the unlinked list until the fs is

	 * repaired.

	 */

	if (unlikely(mp->m_inotbt_nores)) {

	if (unlikely(mp->m_finobt_nores)) {

		error = xfs_trans_alloc(mp, &M_RES(mp)->tr_ifree,

				XFS_IFREE_SPACE_RES(mp), 0, XFS_TRANS_RESERVE,

				&tp);

fs/xfs/xfs_mount.h

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ typedef struct xfs_mount { 
	struct mutex		m_growlock;	/* growfs mutex */

	int			m_fixedfsid[2];	/* unchanged for life of FS */

	uint64_t		m_flags;	/* global mount flags */

	bool			m_inotbt_nores; /* no per-AG finobt resv. */

	bool			m_finobt_nores; /* no per-AG finobt resv. */

	int			m_ialloc_inos;	/* inodes in inode allocation */

	int			m_ialloc_blks;	/* blocks in inode allocation */

	int			m_ialloc_min_blks;/* min blocks in sparse inode