linux-kernel - linux-next: manual merge of the block tree with the djw-vfs, vfs-brauner trees

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20230822131541.7667f165@canb.auug.org.au>
Date:   Tue, 22 Aug 2023 13:15:41 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jens Axboe <axboe@...nel.dk>,
        "Darrick J. Wong" <djwong@...nel.org>,
        Christian Brauner <brauner@...nel.org>
Cc:     Christoph Hellwig <hch@....de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the block tree with the djw-vfs,
 vfs-brauner trees

Hi all,

Today's linux-next merge of the block tree got a conflict in:

  fs/super.c

between commits:

  0ed33598ddf3 ("super: use locking helpers")
  5e8749141521 ("super: wait for nascent superblocks")
  880b9577855e ("fs: distinguish between user initiated freeze and kernel initiated freeze")

from the djw-vfs, vfs-brauner trees and commit:

  4a8b719f95c0 ("fs: remove emergency_thaw_bdev")

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/super.c
index 5062ca612e0d,bc666e7ee1a9..000000000000
--- a/fs/super.c
+++ b/fs/super.c
@@@ -1196,13 -1027,14 +1196,15 @@@ void emergency_remount(void
  
  static void do_thaw_all_callback(struct super_block *sb)
  {
 -	down_write(&sb->s_umount);
 -	if (sb->s_root && sb->s_flags & SB_BORN) {
 +	bool born = super_lock_excl(sb);
 +
 +	if (born && sb->s_root) {
- 		emergency_thaw_bdev(sb);
+ 		if (IS_ENABLED(CONFIG_BLOCK))
+ 			while (sb->s_bdev && !thaw_bdev(sb->s_bdev))
+ 				pr_warn("Emergency Thaw on %pg\n", sb->s_bdev);
 -		thaw_super_locked(sb);
 +		thaw_super_locked(sb, FREEZE_HOLDER_USERSPACE);
  	} else {
 -		up_write(&sb->s_umount);
 +		super_unlock_excl(sb);
  	}
  }
  

Content of type "application/pgp-signature" skipped