Skip to content

Commit fa543e6

Browse files
author
Chandan Babu R
committed
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: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Chandan 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
2 parents 94f6f05 + 442177b commit fa543e6

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

fs/xfs/libxfs/xfs_ag.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,6 +1001,12 @@ xfs_ag_shrink_space(
10011001
error = -ENOSPC;
10021002
goto resv_init_out;
10031003
}
1004+
1005+
/* Update perag geometry */
1006+
pag->block_count -= delta;
1007+
__xfs_agino_range(pag->pag_mount, pag->block_count, &pag->agino_min,
1008+
&pag->agino_max);
1009+
10041010
xfs_ialloc_log_agi(*tpp, agibp, XFS_AGI_LENGTH);
10051011
xfs_alloc_log_agf(*tpp, agfbp, XFS_AGF_LENGTH);
10061012
return 0;

fs/xfs/xfs_extent_busy.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ xfs_extent_busy_insert_list(
6262
rb_link_node(&new->rb_node, parent, rbp);
6363
rb_insert_color(&new->rb_node, &pag->pagb_tree);
6464

65-
list_add(&new->list, busy_list);
65+
/* always process discard lists in fifo order */
66+
list_add_tail(&new->list, busy_list);
6667
spin_unlock(&pag->pagb_lock);
6768
}
6869

0 commit comments

Comments
 (0)