Received-SPF: pass (google.com: domain of linux-ext4+bounces-1808-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Andreas Dilger <adilger@dilger.ca>
Message-Id: <098B73D9-5D47-48A0-91F9-EACD1E1581ED@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_A2302E43-3836-4935-8BF9-1FD6D36E47FB";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH 1/4] e2fsck: update quota accounting after directory
 optimization
Date: Mon, 1 Apr 2024 13:52:07 -0600
In-Reply-To: <20240328172940.1609-2-luis.henriques@linux.dev>
Cc: Theodore Ts'o <tytso@mit.edu>,
 linux-ext4@vger.kernel.org
To: "Luis Henriques (SUSE)" <luis.henriques@linux.dev>
References: <20240328172940.1609-1-luis.henriques@linux.dev>
 <20240328172940.1609-2-luis.henriques@linux.dev>


--Apple-Mail=_A2302E43-3836-4935-8BF9-1FD6D36E47FB
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

On Mar 28, 2024, at 11:29 AM, Luis Henriques (SUSE) =
<luis.henriques@linux.dev> wrote:
>=20
> In "Pass 3A: Optimizing directories", a directory may have it's size =
reduced.
> If that happens and quota is enabled in the filesystem, the quota =
information
> will be incorrect because it doesn't take the rehash into account.  =
This issue
> was detected by running fstest ext4/014.
>=20
> This patch simply updates the quota data accordingly, after the =
directory is
> written and it's size has been updated.
>=20
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=3D218626
> Signed-off-by: Luis Henriques (SUSE) <luis.henriques@linux.dev>

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

> ---
> e2fsck/rehash.c | 27 +++++++++++++++++++++------
> 1 file changed, 21 insertions(+), 6 deletions(-)
>=20
> diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
> index c1da7d52724e..4847d172e5fe 100644
> --- a/e2fsck/rehash.c
> +++ b/e2fsck/rehash.c
> @@ -987,14 +987,18 @@ errcode_t e2fsck_rehash_dir(e2fsck_t ctx, =
ext2_ino_t ino,
> {
> 	ext2_filsys 		fs =3D ctx->fs;
> 	errcode_t		retval;
> -	struct ext2_inode 	inode;
> +	struct ext2_inode_large	inode;
> 	char			*dir_buf =3D 0;
> 	struct fill_dir_struct	fd =3D { NULL, NULL, 0, 0, 0, NULL,
> 				       0, 0, 0, 0, 0, 0 };
> 	struct out_dir		outdir =3D { 0, 0, 0, 0 };
> -	struct name_cmp_ctx name_cmp_ctx =3D {0, NULL};
> +	struct name_cmp_ctx	name_cmp_ctx =3D {0, NULL};
> +	__u64			osize;
>=20
> -	e2fsck_read_inode(ctx, ino, &inode, "rehash_dir");
> +	e2fsck_read_inode_full(ctx, ino, EXT2_INODE(&inode),
> +			       sizeof(inode), "rehash_dir");
> +
> +	osize =3D EXT2_I_SIZE(&inode);
>=20
> 	if (ext2fs_has_feature_inline_data(fs->super) &&
> 	   (inode.i_flags & EXT4_INLINE_DATA_FL))
> @@ -1013,7 +1017,7 @@ errcode_t e2fsck_rehash_dir(e2fsck_t ctx, =
ext2_ino_t ino,
> 	fd.ino =3D ino;
> 	fd.ctx =3D ctx;
> 	fd.buf =3D dir_buf;
> -	fd.inode =3D &inode;
> +	fd.inode =3D EXT2_INODE(&inode);
> 	fd.dir =3D ino;
> 	if (!ext2fs_has_feature_dir_index(fs->super) ||
> 	    (inode.i_size / fs->blocksize) < 2)
> @@ -1092,14 +1096,25 @@ resort:
> 			goto errout;
> 	}
>=20
> -	retval =3D write_directory(ctx, fs, &outdir, ino, &inode, =
fd.compress);
> +	retval =3D write_directory(ctx, fs, &outdir, ino, =
EXT2_INODE(&inode),
> +				 fd.compress);
> 	if (retval)
> 		goto errout;
>=20
> +	if ((osize > EXT2_I_SIZE(&inode)) &&
> +	    (ino !=3D quota_type2inum(PRJQUOTA, fs->super)) &&
> +	    (ino !=3D fs->super->s_orphan_file_inum) &&
> +	    (ino =3D=3D EXT2_ROOT_INO || ino >=3D =
EXT2_FIRST_INODE(ctx->fs->super)) &&
> +	    !(inode.i_flags & EXT4_EA_INODE_FL)) {
> +		quota_data_sub(ctx->qctx, &inode,
> +			       ino, osize - EXT2_I_SIZE(&inode));
> +	}
> +
> 	if (ctx->options & E2F_OPT_CONVERT_BMAP)
> 		retval =3D e2fsck_rebuild_extents_later(ctx, ino);
> 	else
> -		retval =3D e2fsck_check_rebuild_extents(ctx, ino, =
&inode, pctx);
> +		retval =3D e2fsck_check_rebuild_extents(ctx, ino,
> +						      =
EXT2_INODE(&inode), pctx);
> errout:
> 	ext2fs_free_mem(&dir_buf);
> 	ext2fs_free_mem(&fd.harray);


Cheers, Andreas


--Apple-Mail=_A2302E43-3836-4935-8BF9-1FD6D36E47FB
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+AFAmYLEGgACgkQcqXauRfM
H+Av/xAAq4camu7y1nOaxY114JfnXcgVw5Yw8IdakEkMGfFZHmy3rHkMv3Xbye1V
Fx/A2gbC31nOxG3a8Ck+nV73Kublmzl95dag1tnMSmr0AqTdzlTbqymHv5stjELv
tSIF3wvWfmTzXAVGFx19JNTlbErZ2x0ctQpZi15CV+sQ6lI1hZgHMsC/JSLQKirL
zdQH5EpUiUR1/jIEUi1YcxqbkR2J+94TBe26ZR9KyD/p/bp9dJEXMKA7e35+C/CZ
SsHE7+JiCRJvVeRvEMEfwKHZhSNd6ztdQ5mp5vcTLinsmrAqc5jFBLUhJS6iKUcf
kD3zBGzlsUyH4pqGmWCNnlJL5k3BGIW/hlqFJMyroLWGFXAPQ4OlaVux5qtv+xUI
UAWie7nxW9t4O0843DLYzVSwrpnN3wWrh99aVa7otMBvwEKZj2H9BJFRYc4YLPdu
hIKU9egix7Qu4TmIsJalB4/RH0jl3m77Y6tpmiIwl3KFC158tqZNqsIEKCXoG7Iv
TxIfJpUNPu4wEr8r8xPvWutZGHXIP5NVrOztdmU0WPFc2yt5cqLKxxabDcQ/NGil
8TcBg4xfa/E7s0MuNmQgNdyB9QKJM0Rzm0HctQMdZQVoULezOYyz+rzQRmHLhPg9
oNmtUwa+B4DsRU34oPRGyEXUrKnSL/SenplVQjJZJFIePu8wO+4=
=HsB4
-----END PGP SIGNATURE-----

--Apple-Mail=_A2302E43-3836-4935-8BF9-1FD6D36E47FB--