Commit fa543e65 authored by Chandan Babu R's avatar Chandan Babu R
Browse files

Merge tag 'random-fixes-6.6_2023-10-11' of... 

Merge tag 'random-fixes-6.6_2023-10-11' of https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux

 into xfs-6.6-fixesD

xfs: random fixes for 6.6

Rollup of a couple of reviewed fixes.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>

* tag 'random-fixes-6.6_2023-10-11' of https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux:
  xfs: process free extents to busy list in FIFO order
  xfs: adjust the incore perag block_count when shrinking
parents 94f6f055 442177be

fs/xfs/libxfs/xfs_ag.c

+6 −0
Original line number Diff line number Diff line
@@ -1001,6 +1001,12 @@ xfs_ag_shrink_space( 
		error = -ENOSPC;

		goto resv_init_out;

	}



	/* Update perag geometry */

	pag->block_count -= delta;

	__xfs_agino_range(pag->pag_mount, pag->block_count, &pag->agino_min,

				&pag->agino_max);



	xfs_ialloc_log_agi(*tpp, agibp, XFS_AGI_LENGTH);

	xfs_alloc_log_agf(*tpp, agfbp, XFS_AGF_LENGTH);

	return 0;

fs/xfs/xfs_extent_busy.c

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ xfs_extent_busy_insert_list( 
	rb_link_node(&new->rb_node, parent, rbp);

	rb_insert_color(&new->rb_node, &pag->pagb_tree);



	list_add(&new->list, busy_list);

	/* always process discard lists in fifo order */

	list_add_tail(&new->list, busy_list);

	spin_unlock(&pag->pagb_lock);

}