Subject: Re: linux-next: manual merge of the block tree with the ext4 tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 27 Jun 2023 10:46:46 +1000

Hi all,

On Mon, 26 Jun 2023 13:09:51 +1000 Stephen Rothwell <[email-masked]> wrote:
> 
> Today's linux-next merge of the block tree got a conflict in:
> 
>   fs/ext4/super.c
> 
> between commit:
> 
>   ffea255f4052 ("ext4: Fix reusing stale buffer heads from last failed mounting")
> 
> from the ext4 tree and commits:
> 
>   2736e8eeb0cc ("block: use the holder as indication for exclusive opens")
>   a42fb5a75ccc ("ext4: Fix warning in blkdev_put()")
> 
> from the block tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc fs/ext4/super.c
> index b3819e70093e,64342adcd679..000000000000
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@@ -1128,13 -1133,7 +1133,13 @@@ static void ext4_blkdev_remove(struct e
>   	struct block_device *bdev;
>   	bdev = sbi->s_journal_bdev;
>   	if (bdev) {
>  +		/*
>  +		 * Invalidate the journal device's buffers.  We don't want them
>  +		 * floating about in memory - the physical journal device may
>  +		 * hotswapped, and it breaks the `ro-after' testing code.
>  +		 */
>  +		invalidate_bdev(bdev);
> - 		ext4_blkdev_put(bdev);
> + 		blkdev_put(bdev, sbi->s_sb);
>   		sbi->s_journal_bdev = NULL;
>   	}
>   }

This is now a conflict between the ext4 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell