Re: struct xfs_zone_scratch is undefined in 7.0-rc1

[Damien Le Moal <dlemoal@kernel.org>]

On 2/25/26 16:39, Wang Yugui wrote:
> Hi,
> 
> struct xfs_zone_scratch is undefined in 7.0-rc1.
> 
> # grep xfs_zone_scratch -nr *
> fs/xfs/xfs_zone_gc.c:99:        struct xfs_zone_scratch         *scratch;
> #
> 
> Could we change 'struct xfs_zone_scratch  *' to 'void *',
> or just delete this var?

This should do it:

diff --git a/fs/xfs/xfs_zone_gc.c b/fs/xfs/xfs_zone_gc.c
index 48c6cf584447..d78e29cdcc45 100644
--- a/fs/xfs/xfs_zone_gc.c
+++ b/fs/xfs/xfs_zone_gc.c
@@ -96,7 +96,6 @@ struct xfs_gc_bio {
         */
        xfs_fsblock_t                   old_startblock;
        xfs_daddr_t                     new_daddr;
-       struct xfs_zone_scratch         *scratch;

        /* Are we writing to a sequential write required zone? */
        bool                            is_seq;
@@ -779,7 +778,6 @@ xfs_zone_gc_split_write(
        ihold(VFS_I(chunk->ip));
        split_chunk->ip = chunk->ip;
        split_chunk->is_seq = chunk->is_seq;
-       split_chunk->scratch = chunk->scratch;
        split_chunk->offset = chunk->offset;
        split_chunk->len = split_len;
        split_chunk->old_startblock = chunk->old_startblock;

-- 
Damien Le Moal
Western Digital Research