Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Andreas Dilger <adilger@dilger.ca>
Message-Id: <B0FCE075-6DBB-4F1E-BBAB-762112445AB7@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_C98ABB42-779F-468B-82F9-A32B713E39D7";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH 8/9] fscrypt: unexport fscrypt_get_encryption_info()
Date:   Wed, 2 Dec 2020 15:55:26 -0700
In-Reply-To: <20201125002336.274045-9-ebiggers@kernel.org>
Cc:     linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org,
        linux-f2fs-devel@lists.sourceforge.net,
        linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org
To:     Eric Biggers <ebiggers@kernel.org>
References: <20201125002336.274045-1-ebiggers@kernel.org>
 <20201125002336.274045-9-ebiggers@kernel.org>
Precedence: bulk


--Apple-Mail=_C98ABB42-779F-468B-82F9-A32B713E39D7
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii


> On Nov 24, 2020, at 5:23 PM, Eric Biggers <ebiggers@kernel.org> wrote:
>=20
> From: Eric Biggers <ebiggers@google.com>
>=20
> Now that fscrypt_get_encryption_info() is only called from files in
> fs/crypto/ (due to all key setup now being handled by higher-level
> helper functions instead of directly by filesystems), unexport it and
> move its declaration to fscrypt_private.h.
>=20
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Reviewed-by: Andreas Dilger <adilger@dilger.ca>

> ---
> fs/crypto/fscrypt_private.h | 2 ++
> fs/crypto/keysetup.c        | 1 -
> include/linux/fscrypt.h     | 7 +------
> 3 files changed, 3 insertions(+), 7 deletions(-)
>=20
> diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h
> index 16dd55080127..c1c302656c34 100644
> --- a/fs/crypto/fscrypt_private.h
> +++ b/fs/crypto/fscrypt_private.h
> @@ -571,6 +571,8 @@ int fscrypt_derive_dirhash_key(struct fscrypt_info =
*ci,
> void fscrypt_hash_inode_number(struct fscrypt_info *ci,
> 			       const struct fscrypt_master_key *mk);
>=20
> +int fscrypt_get_encryption_info(struct inode *inode);
> +
> /**
>  * fscrypt_require_key() - require an inode's encryption key
>  * @inode: the inode we need the key for
> diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c
> index 50675b42d5b7..6339b3069a40 100644
> --- a/fs/crypto/keysetup.c
> +++ b/fs/crypto/keysetup.c
> @@ -589,7 +589,6 @@ int fscrypt_get_encryption_info(struct inode =
*inode)
> 		res =3D 0;
> 	return res;
> }
> -EXPORT_SYMBOL(fscrypt_get_encryption_info);
>=20
> /**
>  * fscrypt_prepare_new_inode() - prepare to create a new inode in a =
directory
> diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h
> index a07610f27926..4b163f5e58e9 100644
> --- a/include/linux/fscrypt.h
> +++ b/include/linux/fscrypt.h
> @@ -75,7 +75,7 @@ struct fscrypt_operations {
> static inline struct fscrypt_info *fscrypt_get_info(const struct inode =
*inode)
> {
> 	/*
> -	 * Pairs with the cmpxchg_release() in =
fscrypt_get_encryption_info().
> +	 * Pairs with the cmpxchg_release() in =
fscrypt_setup_encryption_info().
> 	 * I.e., another task may publish ->i_crypt_info concurrently, =
executing
> 	 * a RELEASE barrier.  We need to use smp_load_acquire() here to =
safely
> 	 * ACQUIRE the memory the other task published.
> @@ -200,7 +200,6 @@ int fscrypt_ioctl_remove_key_all_users(struct file =
*filp, void __user *arg);
> int fscrypt_ioctl_get_key_status(struct file *filp, void __user *arg);
>=20
> /* keysetup.c */
> -int fscrypt_get_encryption_info(struct inode *inode);
> int fscrypt_prepare_new_inode(struct inode *dir, struct inode *inode,
> 			      bool *encrypt_ret);
> void fscrypt_put_encryption_info(struct inode *inode);
> @@ -408,10 +407,6 @@ static inline int =
fscrypt_ioctl_get_key_status(struct file *filp,
> }
>=20
> /* keysetup.c */
> -static inline int fscrypt_get_encryption_info(struct inode *inode)
> -{
> -	return -EOPNOTSUPP;
> -}
>=20
> static inline int fscrypt_prepare_new_inode(struct inode *dir,
> 					    struct inode *inode,
> --
> 2.29.2
>=20


Cheers, Andreas


--Apple-Mail=_C98ABB42-779F-468B-82F9-A32B713E39D7
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org

iQIzBAEBCAAdFiEEDb73u6ZejP5ZMprvcqXauRfMH+AFAl/IG18ACgkQcqXauRfM
H+Bb3Q/+N5KoLVZ0SdPOGc9zFf30gVxx9174tO5hYC8bEXeibRo93gRWaBks6jTz
bKADVjbP+PsYOkOVkiVEjxDYaVecrOLCZM4i0HYbSkBC2TF+FMf+8t6Off/ADUdv
zCDcRRget6d6/xvWQmnX/neBSax+mJ9NThwmwtP52BiYgH7Ufw9DU3y1s7cYUcqw
lxkKunK0y5g+Pv0AeN1BP4tVSj4JD4zBoIuWYaJaj5jXMtRVS0Z9hjayM/jEozhp
VeQzo1KlHTtzlX2RUT8V3f+MxEKtwm7yb21eKGRi8chOl8lG9rpayZ/h2BKm2TD2
uG/Eb0tP/22P0f++v31nUb+GlE3VcuSZUEdckw6tR/11Jc3vpKB2dzG28qgweiX5
Acf7xvneXY8hJIQqoRjdPxU0chyQ1XbYL1o3fV6Pu7OeMchPRgei+nocseE5LQBv
3WuxcX31YtNMI3piijqyr9RFaKp2jFzuPK9pY7RAvdk/h9SRTxhevMhb22vn8EkB
vWz6D9TiIVyA6Solq0VCd0IYKZh66+kQ1eLxOmbBclENmzjqDahynk5jWi3g8Mhz
whCP62Vo7aCE+kpnNL7V4ZNvQ5/a5ylPvvNbppQ+q6xFbeXT3uAtl9DaIXMZHj7q
aOqCgMNW1I5SjXCtvpHPBjGQaJdAr3EbztK+02kQXvfohio7PKY=
=boNE
-----END PGP SIGNATURE-----

--Apple-Mail=_C98ABB42-779F-468B-82F9-A32B713E39D7--