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: <3D0D6321-5CFD-4AE0-B88D-B8ED12F97739@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_C262FF56-6A88-4357-9BAB-C8F06E08B972";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH 05/12] ext4: Move functions in super.c
Date:   Sun, 29 Nov 2020 15:13:51 -0700
In-Reply-To: <20201127113405.26867-6-jack@suse.cz>
Cc:     Ted Tso <tytso@mit.edu>, linux-ext4@vger.kernel.org
To:     Jan Kara <jack@suse.cz>
References: <20201127113405.26867-1-jack@suse.cz>
 <20201127113405.26867-6-jack@suse.cz>
Precedence: bulk


--Apple-Mail=_C262FF56-6A88-4357-9BAB-C8F06E08B972
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

On Nov 27, 2020, at 4:33 AM, Jan Kara <jack@suse.cz> wrote:
>=20
> Just move error info related functions in super.c close to
> ext4_handle_error(). We'll want to combine save_error_info() with
> ext4_handle_error() and this makes change more obvious and saves a
> forward declaration as well. No functional change.
>=20
> Signed-off-by: Jan Kara <jack@suse.cz>

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

> ---
> fs/ext4/super.c | 196 =
++++++++++++++++++++++++++++----------------------------
> 1 file changed, 98 insertions(+), 98 deletions(-)
>=20
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index dddaadc55475..7948c07d0a90 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -423,104 +423,6 @@ static time64_t __ext4_get_tstamp(__le32 *lo, =
__u8 *hi)
> #define ext4_get_tstamp(es, tstamp) \
> 	__ext4_get_tstamp(&(es)->tstamp, &(es)->tstamp ## _hi)
>=20
> -static void __save_error_info(struct super_block *sb, int error,
> -			      __u32 ino, __u64 block,
> -			      const char *func, unsigned int line)
> -{
> -	struct ext4_super_block *es =3D EXT4_SB(sb)->s_es;
> -	int err;
> -
> -	EXT4_SB(sb)->s_mount_state |=3D EXT4_ERROR_FS;
> -	if (bdev_read_only(sb->s_bdev))
> -		return;
> -	es->s_state |=3D cpu_to_le16(EXT4_ERROR_FS);
> -	ext4_update_tstamp(es, s_last_error_time);
> -	strncpy(es->s_last_error_func, func, =
sizeof(es->s_last_error_func));
> -	es->s_last_error_line =3D cpu_to_le32(line);
> -	es->s_last_error_ino =3D cpu_to_le32(ino);
> -	es->s_last_error_block =3D cpu_to_le64(block);
> -	switch (error) {
> -	case EIO:
> -		err =3D EXT4_ERR_EIO;
> -		break;
> -	case ENOMEM:
> -		err =3D EXT4_ERR_ENOMEM;
> -		break;
> -	case EFSBADCRC:
> -		err =3D EXT4_ERR_EFSBADCRC;
> -		break;
> -	case 0:
> -	case EFSCORRUPTED:
> -		err =3D EXT4_ERR_EFSCORRUPTED;
> -		break;
> -	case ENOSPC:
> -		err =3D EXT4_ERR_ENOSPC;
> -		break;
> -	case ENOKEY:
> -		err =3D EXT4_ERR_ENOKEY;
> -		break;
> -	case EROFS:
> -		err =3D EXT4_ERR_EROFS;
> -		break;
> -	case EFBIG:
> -		err =3D EXT4_ERR_EFBIG;
> -		break;
> -	case EEXIST:
> -		err =3D EXT4_ERR_EEXIST;
> -		break;
> -	case ERANGE:
> -		err =3D EXT4_ERR_ERANGE;
> -		break;
> -	case EOVERFLOW:
> -		err =3D EXT4_ERR_EOVERFLOW;
> -		break;
> -	case EBUSY:
> -		err =3D EXT4_ERR_EBUSY;
> -		break;
> -	case ENOTDIR:
> -		err =3D EXT4_ERR_ENOTDIR;
> -		break;
> -	case ENOTEMPTY:
> -		err =3D EXT4_ERR_ENOTEMPTY;
> -		break;
> -	case ESHUTDOWN:
> -		err =3D EXT4_ERR_ESHUTDOWN;
> -		break;
> -	case EFAULT:
> -		err =3D EXT4_ERR_EFAULT;
> -		break;
> -	default:
> -		err =3D EXT4_ERR_UNKNOWN;
> -	}
> -	es->s_last_error_errcode =3D err;
> -	if (!es->s_first_error_time) {
> -		es->s_first_error_time =3D es->s_last_error_time;
> -		es->s_first_error_time_hi =3D es->s_last_error_time_hi;
> -		strncpy(es->s_first_error_func, func,
> -			sizeof(es->s_first_error_func));
> -		es->s_first_error_line =3D cpu_to_le32(line);
> -		es->s_first_error_ino =3D es->s_last_error_ino;
> -		es->s_first_error_block =3D es->s_last_error_block;
> -		es->s_first_error_errcode =3D es->s_last_error_errcode;
> -	}
> -	/*
> -	 * Start the daily error reporting function if it hasn't been
> -	 * started already
> -	 */
> -	if (!es->s_error_count)
> -		mod_timer(&EXT4_SB(sb)->s_err_report, jiffies + =
24*60*60*HZ);
> -	le32_add_cpu(&es->s_error_count, 1);
> -}
> -
> -static void save_error_info(struct super_block *sb, int error,
> -			    __u32 ino, __u64 block,
> -			    const char *func, unsigned int line)
> -{
> -	__save_error_info(sb, error, ino, block, func, line);
> -	if (!bdev_read_only(sb->s_bdev))
> -		ext4_commit_super(sb, 1);
> -}
> -
> /*
>  * The del_gendisk() function uninitializes the disk-specific data
>  * structures, including the bdi structure, without telling anyone
> @@ -649,6 +551,104 @@ static bool system_going_down(void)
> 		|| system_state =3D=3D SYSTEM_RESTART;
> }
>=20
> +static void __save_error_info(struct super_block *sb, int error,
> +			      __u32 ino, __u64 block,
> +			      const char *func, unsigned int line)
> +{
> +	struct ext4_super_block *es =3D EXT4_SB(sb)->s_es;
> +	int err;
> +
> +	EXT4_SB(sb)->s_mount_state |=3D EXT4_ERROR_FS;
> +	if (bdev_read_only(sb->s_bdev))
> +		return;
> +	es->s_state |=3D cpu_to_le16(EXT4_ERROR_FS);
> +	ext4_update_tstamp(es, s_last_error_time);
> +	strncpy(es->s_last_error_func, func, =
sizeof(es->s_last_error_func));
> +	es->s_last_error_line =3D cpu_to_le32(line);
> +	es->s_last_error_ino =3D cpu_to_le32(ino);
> +	es->s_last_error_block =3D cpu_to_le64(block);
> +	switch (error) {
> +	case EIO:
> +		err =3D EXT4_ERR_EIO;
> +		break;
> +	case ENOMEM:
> +		err =3D EXT4_ERR_ENOMEM;
> +		break;
> +	case EFSBADCRC:
> +		err =3D EXT4_ERR_EFSBADCRC;
> +		break;
> +	case 0:
> +	case EFSCORRUPTED:
> +		err =3D EXT4_ERR_EFSCORRUPTED;
> +		break;
> +	case ENOSPC:
> +		err =3D EXT4_ERR_ENOSPC;
> +		break;
> +	case ENOKEY:
> +		err =3D EXT4_ERR_ENOKEY;
> +		break;
> +	case EROFS:
> +		err =3D EXT4_ERR_EROFS;
> +		break;
> +	case EFBIG:
> +		err =3D EXT4_ERR_EFBIG;
> +		break;
> +	case EEXIST:
> +		err =3D EXT4_ERR_EEXIST;
> +		break;
> +	case ERANGE:
> +		err =3D EXT4_ERR_ERANGE;
> +		break;
> +	case EOVERFLOW:
> +		err =3D EXT4_ERR_EOVERFLOW;
> +		break;
> +	case EBUSY:
> +		err =3D EXT4_ERR_EBUSY;
> +		break;
> +	case ENOTDIR:
> +		err =3D EXT4_ERR_ENOTDIR;
> +		break;
> +	case ENOTEMPTY:
> +		err =3D EXT4_ERR_ENOTEMPTY;
> +		break;
> +	case ESHUTDOWN:
> +		err =3D EXT4_ERR_ESHUTDOWN;
> +		break;
> +	case EFAULT:
> +		err =3D EXT4_ERR_EFAULT;
> +		break;
> +	default:
> +		err =3D EXT4_ERR_UNKNOWN;
> +	}
> +	es->s_last_error_errcode =3D err;
> +	if (!es->s_first_error_time) {
> +		es->s_first_error_time =3D es->s_last_error_time;
> +		es->s_first_error_time_hi =3D es->s_last_error_time_hi;
> +		strncpy(es->s_first_error_func, func,
> +			sizeof(es->s_first_error_func));
> +		es->s_first_error_line =3D cpu_to_le32(line);
> +		es->s_first_error_ino =3D es->s_last_error_ino;
> +		es->s_first_error_block =3D es->s_last_error_block;
> +		es->s_first_error_errcode =3D es->s_last_error_errcode;
> +	}
> +	/*
> +	 * Start the daily error reporting function if it hasn't been
> +	 * started already
> +	 */
> +	if (!es->s_error_count)
> +		mod_timer(&EXT4_SB(sb)->s_err_report, jiffies + =
24*60*60*HZ);
> +	le32_add_cpu(&es->s_error_count, 1);
> +}
> +
> +static void save_error_info(struct super_block *sb, int error,
> +			    __u32 ino, __u64 block,
> +			    const char *func, unsigned int line)
> +{
> +	__save_error_info(sb, error, ino, block, func, line);
> +	if (!bdev_read_only(sb->s_bdev))
> +		ext4_commit_super(sb, 1);
> +}
> +
> /* Deal with the reporting of failure conditions on a filesystem such =
as
>  * inconsistencies detected or read IO failures.
>  *
> --
> 2.16.4
>=20


Cheers, Andreas


--Apple-Mail=_C262FF56-6A88-4357-9BAB-C8F06E08B972
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/EHR8ACgkQcqXauRfM
H+Cmlw/8CQ5SWwyLausIl5PfaJi3oLZSN6dLSz6Rpz0YyHvL/nHOPQZbE6+1+YGU
2HzN7eUHTGNRa0LQe670wEg+VitP7fSmLJwJd6+/M1R+AAuNBicP7dCl4EKtoj+q
Tj/UQOh7sAil9ImbCOdo4ngh1n8qLSftlICBUcqKU8MxDlKVlyfcolyB/FqdevfK
RgXg6tpv7c/NQfWryUBKOJraR0J7YtVs5jpEqq/qJpORv4f4IbdNxOOI2QhMgLdA
DVs4weuzczKKnQlgMvmraHaVKDSzZaaYZ5Dn6SUkT4iLETWvpD5S3NS3J2KoWDu+
44gsQ46WaFO8D8FzrueZ761o1Gp9pckL9PQDMKAeU64/DxRg6jzYcS2KP71EAlrl
Io1Ms0lkMXCLrg8rmMdVirsltNtyrBMZJxc9Mye1Vg/vQ7narNUed9pHNHu6nzKu
9cecC8oSnnrm0w3KQEQsOONMK7pca9SChQImmpV922MpyHoxa/wjnoTBagmC2FeX
oK5/LcuJwszL4HUNKGJq/ZiVsNhc8iLI+fAKXytXkJAGJw73I99ysm4HpxUEOrGs
tL/8TxWeIK8111PrFGATeK2saMOWOOhsZDYtEQEVllnp4XYqYu/wfG+33YZz/9Dn
CLo7ObLJyy2VBivPgX0kVT3jVVmQ3Q7QTXl42SP43HClBJxQ9I8=
=Rb+i
-----END PGP SIGNATURE-----

--Apple-Mail=_C262FF56-6A88-4357-9BAB-C8F06E08B972--