Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Date:   Mon, 11 Dec 2023 15:13:03 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Ard Biesheuvel <ardb@kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Masahisa Kojima <masahisa.kojima@linaro.org>
Subject: linux-next: manual merge of the efi tree with the efi-fixes tree
Message-ID: <20231211151303.1286eda5@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/yo8XSFAKhlr3OmIsAQtWar4";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/yo8XSFAKhlr3OmIsAQtWar4
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  fs/efivarfs/super.c

between commits:

  0b6d38bdd6f8 ("efivarfs: Free s_fs_info on unmount")
  ab5c4251a009 ("efivarfs: Move efivarfs list into superblock s_fs_info")

from the efi-fixes tree and commit:

  b501d5b36f58 ("efivarfs: automatically update super block flag")

from the efi 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.

--=20
Cheers,
Stephen Rothwell

diff --cc fs/efivarfs/super.c
index d7d9a3e189a0,42eff5ac7ab4..000000000000
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@@ -18,6 -20,32 +20,30 @@@
 =20
  #include "internal.h"
 =20
 -LIST_HEAD(efivarfs_list);
 -
+ struct efivarfs_info {
+ 	struct super_block *sb;
+ 	struct notifier_block nb;
+ };
+=20
+ static struct efivarfs_info info;
+=20
+ static int efivarfs_ops_notifier(struct notifier_block *nb, unsigned long=
 event,
+ 				 void *data)
+ {
+ 	switch (event) {
+ 	case EFIVAR_OPS_RDONLY:
+ 		info.sb->s_flags |=3D SB_RDONLY;
+ 		break;
+ 	case EFIVAR_OPS_RDWR:
+ 		info.sb->s_flags &=3D ~SB_RDONLY;
+ 		break;
+ 	default:
+ 		return NOTIFY_DONE;
+ 	}
+=20
+ 	return NOTIFY_OK;
+ }
+=20
  static void efivarfs_evict_inode(struct inode *inode)
  {
  	clear_inode(inode);
@@@ -316,10 -345,17 +342,16 @@@ static int efivarfs_fill_super(struct s
  	if (!root)
  		return -ENOMEM;
 =20
+ 	info.sb =3D sb;
+ 	info.nb.notifier_call =3D efivarfs_ops_notifier;
+ 	err =3D blocking_notifier_chain_register(&efivar_ops_nh, &info.nb);
+ 	if (err)
+ 		return err;
+=20
 -	INIT_LIST_HEAD(&efivarfs_list);
 -
 -	err =3D efivar_init(efivarfs_callback, (void *)sb, true, &efivarfs_list);
 +	err =3D efivar_init(efivarfs_callback, (void *)sb, true,
 +			  &info->efivarfs_list);
  	if (err)
 -		efivar_entry_iter(efivarfs_destroy, &efivarfs_list, NULL);
 +		efivar_entry_iter(efivarfs_destroy, &info->efivarfs_list, NULL);
 =20
  	return err;
  }
@@@ -357,13 -399,15 +400,15 @@@ static int efivarfs_init_fs_context(str
 =20
  static void efivarfs_kill_sb(struct super_block *sb)
  {
 +	struct efivarfs_fs_info *sfi =3D sb->s_fs_info;
 +
+ 	blocking_notifier_chain_unregister(&efivar_ops_nh, &info.nb);
+ 	info.sb =3D NULL;
  	kill_litter_super(sb);
 =20
 -	if (!efivar_is_available())
 -		return;
 -
  	/* Remove all entries and destroy */
 -	efivar_entry_iter(efivarfs_destroy, &efivarfs_list, NULL);
 +	efivar_entry_iter(efivarfs_destroy, &sfi->efivarfs_list, NULL);
 +	kfree(sfi);
  }
 =20
  static struct file_system_type efivarfs_type =3D {

--Sig_/yo8XSFAKhlr3OmIsAQtWar4
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV2jE8ACgkQAVBC80lX
0GxcBwgAh2gcjj6B3ickMq+S4X3yAaOwRgkzLXr+OJJmxX0vrDrDp/ZF9PcgHo7c
2ArueoIYYI0B+NmSIHi7HYRoiC4BG4OnANUR6XWPFXG7qedXHRdPbIHN+252DLZf
fnQmOifXXwJR4AsSK2RwP4tDrbqlMaWn/sOaSID2Cg+1+hF5p63gAhCkD9RiY+rl
0dT3XMgYpv5C9qMCqKaD9wUTz5lwfx0NV2SEWY7TDI8e5VtxcHIBUo4JAU8kzym8
x0H12393BFOcAnw2/AXxa6u175Af5DImZMNO6LDM4/h42iZDkLtpQi+TbdlgDqIF
T/SUMORhlIWGniiL/ROllYsUgO3Xng==
=zZwH
-----END PGP SIGNATURE-----

--Sig_/yo8XSFAKhlr3OmIsAQtWar4--