diff options
| author | Chandan Babu R <chandanbabu@kernel.org> | 2023-10-12 10:07:54 +0530 |
|---|---|---|
| committer | Chandan Babu R <chandanbabu@kernel.org> | 2023-10-12 10:07:54 +0530 |
| commit | fa543e65abad671eb4c1ee56ec2c8932f40bdf6f (patch) | |
| tree | 7693454ae51e8efef553a98f831f550250683185 | |
| parent | 94f6f0550c625fab1f373bb86a6669b45e9748b3 (diff) | |
| parent | 442177be8c3b8edfc29e14837e59771181c590b3 (diff) | |
| download | ubifs-fa543e65abad671eb4c1ee56ec2c8932f40bdf6f.tar.gz | |
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
| -rw-r--r-- | fs/xfs/libxfs/xfs_ag.c | 6 | ||||
| -rw-r--r-- | fs/xfs/xfs_extent_busy.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/fs/xfs/libxfs/xfs_ag.c b/fs/xfs/libxfs/xfs_ag.c index e9cc481b4ddff1..f9f4d694640d04 100644 --- a/fs/xfs/libxfs/xfs_ag.c +++ b/fs/xfs/libxfs/xfs_ag.c @@ -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; diff --git a/fs/xfs/xfs_extent_busy.c b/fs/xfs/xfs_extent_busy.c index 746814815b1da7..9ecfdcdc752f79 100644 --- a/fs/xfs/xfs_extent_busy.c +++ b/fs/xfs/xfs_extent_busy.c @@ -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); } |