Received-SPF: pass (google.com: domain of linux-ext4+bounces-1867-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Andreas Dilger <adilger@dilger.ca>
Message-Id: <04E748F4-0CE8-4376-B9E7-F1798EE84F67@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_29909484-59C8-4939-8E4F-3DD950891FD2";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH v2 2/4] e2fsck: update quota when deallocating a bad inode
Date: Thu, 4 Apr 2024 11:25:32 -0600
In-Reply-To: <20240404111032.10427-3-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: <20240404111032.10427-1-luis.henriques@linux.dev>
 <20240404111032.10427-3-luis.henriques@linux.dev>


--Apple-Mail=_29909484-59C8-4939-8E4F-3DD950891FD2
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

On Apr 4, 2024, at 5:10 AM, Luis Henriques (SUSE) =
<luis.henriques@linux.dev> wrote:
>=20
> If a bad inode is found it will be deallocated.  However, if the =
filesystem has
> quota enabled, the quota information isn't being updated accordingly.  =
This
> issue was detected by running fstest ext4/019.
>=20
> This patch fixes the issue by decreasing the inode count from the
> quota and, if blocks are also being released, also subtract them as =
well.
>=20
> Signed-off-by: Luis Henriques (SUSE) <luis.henriques@linux.dev>
> ---
> e2fsck/pass2.c | 33 +++++++++++++++++++++++----------
> 1 file changed, 23 insertions(+), 10 deletions(-)
>=20
> diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
> index b91628567a7f..e16b488af643 100644
> --- a/e2fsck/pass2.c
> +++ b/e2fsck/pass2.c
> @@ -1859,12 +1859,13 @@ static int deallocate_inode_block(ext2_filsys =
fs,

I'd hoped you might include a better comment for this function, but the =
code
itself looks OK.

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

> static void deallocate_inode(e2fsck_t ctx, ext2_ino_t ino, char* =
block_buf)
> {
> 	ext2_filsys fs =3D ctx->fs;
> -	struct ext2_inode	inode;
> +	struct ext2_inode_large	inode;
> 	struct problem_context	pctx;
> 	__u32			count;
> 	struct del_block	del_block;
>=20
> -	e2fsck_read_inode(ctx, ino, &inode, "deallocate_inode");
> +	e2fsck_read_inode_full(ctx, ino, EXT2_INODE(&inode),
> +			       sizeof(inode), "deallocate_inode");
> 	clear_problem_context(&pctx);
> 	pctx.ino =3D ino;
>=20
> @@ -1874,29 +1875,29 @@ static void deallocate_inode(e2fsck_t ctx, =
ext2_ino_t ino, char* block_buf)
> 	e2fsck_read_bitmaps(ctx);
> 	ext2fs_inode_alloc_stats2(fs, ino, -1, =
LINUX_S_ISDIR(inode.i_mode));
>=20
> -	if (ext2fs_file_acl_block(fs, &inode) &&
> +	if (ext2fs_file_acl_block(fs, EXT2_INODE(&inode)) &&
> 	    ext2fs_has_feature_xattr(fs->super)) {
> 		pctx.errcode =3D ext2fs_adjust_ea_refcount3(fs,
> -				ext2fs_file_acl_block(fs, &inode),
> +				ext2fs_file_acl_block(fs, =
EXT2_INODE(&inode)),
> 				block_buf, -1, &count, ino);
> 		if (pctx.errcode =3D=3D EXT2_ET_BAD_EA_BLOCK_NUM) {
> 			pctx.errcode =3D 0;
> 			count =3D 1;
> 		}
> 		if (pctx.errcode) {
> -			pctx.blk =3D ext2fs_file_acl_block(fs, &inode);
> +			pctx.blk =3D ext2fs_file_acl_block(fs, =
EXT2_INODE(&inode));
> 			fix_problem(ctx, PR_2_ADJ_EA_REFCOUNT, &pctx);
> 			ctx->flags |=3D E2F_FLAG_ABORT;
> 			return;
> 		}
> 		if (count =3D=3D 0) {
> 			ext2fs_block_alloc_stats2(fs,
> -				  ext2fs_file_acl_block(fs, &inode), =
-1);
> +				  ext2fs_file_acl_block(fs, =
EXT2_INODE(&inode)), -1);
> 		}
> -		ext2fs_file_acl_block_set(fs, &inode, 0);
> +		ext2fs_file_acl_block_set(fs, EXT2_INODE(&inode), 0);
> 	}
>=20
> -	if (!ext2fs_inode_has_valid_blocks2(fs, &inode))
> +	if (!ext2fs_inode_has_valid_blocks2(fs, EXT2_INODE(&inode)))
> 		goto clear_inode;
>=20
> 	/* Inline data inodes don't have blocks to iterate */
> @@ -1921,10 +1922,22 @@ static void deallocate_inode(e2fsck_t ctx, =
ext2_ino_t ino, char* block_buf)
> 		ctx->flags |=3D E2F_FLAG_ABORT;
> 		return;
> 	}
> +
> +	if ((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)) {
> +		if (del_block.num > 0)
> +			quota_data_sub(ctx->qctx, &inode, ino,
> +				       del_block.num * =
EXT2_CLUSTER_SIZE(fs->super));
> +		quota_data_inodes(ctx->qctx, (struct ext2_inode_large =
*)&inode,
> +				  ino, -1);
> +	}
> +
> clear_inode:
> 	/* Inode may have changed by block_iterate, so reread it */
> -	e2fsck_read_inode(ctx, ino, &inode, "deallocate_inode");
> -	e2fsck_clear_inode(ctx, ino, &inode, 0, "deallocate_inode");
> +	e2fsck_read_inode(ctx, ino, EXT2_INODE(&inode), =
"deallocate_inode");
> +	e2fsck_clear_inode(ctx, ino, EXT2_INODE(&inode), 0, =
"deallocate_inode");
> }
>=20
> /*


Cheers, Andreas


--Apple-Mail=_29909484-59C8-4939-8E4F-3DD950891FD2
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+AFAmYO4owACgkQcqXauRfM
H+ArRQ/9GLbcyZP+Nu+glWMh5jTKs1ZHRlibcUNxYPNr1aQjKx3DlbId2tmnfPh4
Jyod75T9Q+wcUDeGcgWoUPI1Lm3c99twDLWFFllCswN1MUStZBc4lvpCjJS+Z8Ur
CLpbJ6jyC/0/4uck8/GtrIJplWqct+dOFMACW/ilq9Px/J2/P1POUBK0olxg1Vzb
uJKWVGsZaP4w/xSXnazdU+UhHlSbGXld75pFYwIC98eTKfXl/50iFuxabX1t4ifG
lDrNx1fMHI9vKGumRfGE7SVPGqbKi6zNHitpMv8f85VTcLzMjh+CHm7En+bwCA0G
4W4f6pSm9Y646vzsw9oowHYzau3zJdGbmyyeg97Q4B1Q5t00bL/cAmo7ZO2mWFH/
9LazzRdLyTfy9urDnc8PsSF3AgKifnOZPv1IMs5MJ2IHHq4fUA2jqOBV1yrqY5gE
YbZ8OaHiNYL6xR2iyFk7+UNT8HylZhfJCffcdur3AyBNj5drX+tfo67tvGDJPi79
Vz2xJ9ZelJQwQZ8wmBpJSb7qd/W8ZmSlNKheoCZ59WKR8brdq2fseM7Sw8gX7UZl
61E9eB/algOWGdCubazATB1EgfvQqZBMzPEc2O6bKv+TP+VnoLKjGutqDYJ3uOcD
H6d3rJZltU2K18eTqe+nIxZ1goZQJHvDtFs9aEvAsIuUg4bsruQ=
=P8OP
-----END PGP SIGNATURE-----

--Apple-Mail=_29909484-59C8-4939-8E4F-3DD950891FD2--