Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Andreas Dilger <adilger@dilger.ca>
Message-Id: <34AB07FF-1872-46EB-B7B6-5CE24EFB39C6@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_D17841AA-B3F2-4A33-946F-C25AFAE866F5";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH 1/2] ext4: return lblk from ext4_find_entry
Date:   Sat, 28 Mar 2020 17:24:10 -0600
In-Reply-To: <20200325093728.204211-1-harshadshirwadkar@gmail.com>
Cc:     linux-ext4@vger.kernel.org
To:     Harshad Shirwadkar <harshadshirwadkar@gmail.com>
References: <20200325093728.204211-1-harshadshirwadkar@gmail.com>
Sender: linux-ext4-owner@vger.kernel.org
Precedence: bulk


--Apple-Mail=_D17841AA-B3F2-4A33-946F-C25AFAE866F5
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

On Mar 25, 2020, at 3:37 AM, Harshad Shirwadkar =
<harshadshirwadkar@gmail.com> wrote:
>=20
> This patch makes ext4_find_entry and related routines to return
> logical block address of the dirent block. This logical block address
> is used in the directory shrinking code to perform reverse lookup and
> verify that the lookup was successful.
>=20
> Signed-off-by: Harshad Shirwadkar <harshadshirwadkar@gmail.com>
> ---
> fs/ext4/namei.c | 54 +++++++++++++++++++++++++++++--------------------
> 1 file changed, 32 insertions(+), 22 deletions(-)

Would it make sense to add the "lblk" field to struct ext4_renament,
rather than adding an extra argument for all of these functions?

Otherwise, the patch looks OK.

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

> static void ext4_rename_delete(handle_t *handle, struct ext4_renament =
*ent,
> -			       int force_reread)
> +			       int force_reread, ext4_lblk_t lblk)
> {
> 	int retval;
> 	/*
> @@ -3593,7 +3600,8 @@ static void ext4_rename_delete(handle_t *handle, =
struct ext4_renament *ent,
> 		retval =3D ext4_find_delete_entry(handle, ent->dir,
> 						&ent->dentry->d_name);
> 	} else {
> -		retval =3D ext4_delete_entry(handle, ent->dir, ent->de, =
ent->bh);
> +		retval =3D ext4_delete_entry(handle, ent->dir, ent->de, =
ent->bh,
> +					   lblk);
> 		if (retval =3D=3D -ENOENT) {
> 			retval =3D ext4_find_delete_entry(handle, =
ent->dir,
> 							=
&ent->dentry->d_name);
> @@ -3679,6 +3687,7 @@ static int ext4_rename(struct inode *old_dir, =
struct dentry *old_dentry,
> 	struct inode *whiteout =3D NULL;
> 	int credits;
> 	u8 old_file_type;
> +	ext4_lblk_t lblk;
>=20
> 	if (new.inode && new.inode->i_nlink =3D=3D 0) {
> 		EXT4_ERROR_INODE(new.inode,
> @@ -3706,7 +3715,8 @@ static int ext4_rename(struct inode *old_dir, =
struct dentry *old_dentry,
> 			return retval;
> 	}
>=20
> -	old.bh =3D ext4_find_entry(old.dir, &old.dentry->d_name, =
&old.de, NULL);
> +	old.bh =3D ext4_find_entry(old.dir, &old.dentry->d_name, =
&old.de, NULL,
> +				 &lblk);
> 	if (IS_ERR(old.bh))
> 		return PTR_ERR(old.bh);
> 	/*
> @@ -3720,7 +3730,7 @@ static int ext4_rename(struct inode *old_dir, =
struct dentry *old_dentry,
> 		goto end_rename;
>=20
> 	new.bh =3D ext4_find_entry(new.dir, &new.dentry->d_name,
> -				 &new.de, &new.inlined);
> +				 &new.de, &new.inlined, NULL);
> 	if (IS_ERR(new.bh)) {
> 		retval =3D PTR_ERR(new.bh);
> 		new.bh =3D NULL;
> @@ -3817,7 +3827,7 @@ static int ext4_rename(struct inode *old_dir, =
struct dentry *old_dentry,
> 		/*
> 		 * ok, that's it
> 		 */
> -		ext4_rename_delete(handle, &old, force_reread);
> +		ext4_rename_delete(handle, &old, force_reread, lblk);
> 	}
>=20
> 	if (new.inode) {
> @@ -3900,7 +3910,7 @@ static int ext4_cross_rename(struct inode =
*old_dir, struct dentry *old_dentry,
> 		return retval;
>=20
> 	old.bh =3D ext4_find_entry(old.dir, &old.dentry->d_name,
> -				 &old.de, &old.inlined);
> +				 &old.de, &old.inlined, NULL);
> 	if (IS_ERR(old.bh))
> 		return PTR_ERR(old.bh);
> 	/*
> @@ -3914,7 +3924,7 @@ static int ext4_cross_rename(struct inode =
*old_dir, struct dentry *old_dentry,
> 		goto end_rename;
>=20
> 	new.bh =3D ext4_find_entry(new.dir, &new.dentry->d_name,
> -				 &new.de, &new.inlined);
> +				 &new.de, &new.inlined, NULL);
> 	if (IS_ERR(new.bh)) {
> 		retval =3D PTR_ERR(new.bh);
> 		new.bh =3D NULL;
> --
> 2.25.1.696.g5e7596f4ac-goog
>=20


Cheers, Andreas


--Apple-Mail=_D17841AA-B3F2-4A33-946F-C25AFAE866F5
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+AFAl5/3JoACgkQcqXauRfM
H+BrNA/+KHU0JftNZYfkXn6XZVHCfvVfzNltLUG8DANiSfoiD4O3LjPiZT9/OFAn
5tkYfw05zCKBWvh0gcJ9SIjZHBrthvqCwDVQY6hXtM4JVTZa5xiZDHsSFCIgyBNs
j7ku8rP4ABVFMnmIKiP1UpbMix02xXkMTdsHLaDu0KVKQVenGMNp5KbBq8c9naAh
bX4kiXvoavrRXPsM9NKVyR7HXVsuSDFSpoHgyGsMzU5NMYLKwIqYIOvYI2irqfUv
KIm+u4JzX6xwAFBYX0z97kofNg1Rq5sjqUTKeKFr9A70shvhDzysTwrF0OLAZ7G9
k4nePYlz9jnWyvvWvQjlKHVJPI7qq5HZPCrRb6rCB6G2xtNtRWLZXfBkgKvpWIbp
zYLTUVTm/O4GzsJnLX4fQ3zkAnb7n2lTmQHJZqB9fnI7KY25qfYK51ndYG+SZyJc
rhrpr2HKh3Xrs1TWHCNl8NzkFNzOdmThOzhJ3lpYxtv0TDVE2OBXfhIPlMtj5Hu6
SaPhmol3NNIqZDN0grywHea0Ozl3HWwhBBABLYIwj6KLax6EgGXhjPNJj+TSXPgC
YEKFSMN+G6s+WhCWe+tdptWhuQjlHAvelA03Dt7P98XNW1P1JRMMkBhfBYm5qJlR
ClYtV5oOl0XlxbisMbWd5YxWx89PICd98e00ITUmk+pBA9rK2YA=
=MyI9
-----END PGP SIGNATURE-----

--Apple-Mail=_D17841AA-B3F2-4A33-946F-C25AFAE866F5--