From:   Andreas Dilger <adilger@dilger.ca>
Message-Id: <BDB26C76-310F-4925-BE41-034D62B2797B@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_518C01EE-D4D3-49EB-B727-660A010E6807";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH v7 1/4] ext2fs: opening filesystem code refactoring
Date:   Tue, 29 Jan 2019 20:01:03 -0700
In-Reply-To: <20190129175134.26652-2-c17828@cray.com>
Cc:     Ext4 Developers List <linux-ext4@vger.kernel.org>
To:     Artem Blagodarenko <artem.blagodarenko@gmail.com>
References: <20190129175134.26652-1-c17828@cray.com>
 <20190129175134.26652-2-c17828@cray.com>
Sender: linux-ext4-owner@vger.kernel.org
Precedence: bulk


--Apple-Mail=_518C01EE-D4D3-49EB-B727-660A010E6807
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

On Jan 29, 2019, at 10:51 AM, Artem Blagodarenko =
<artem.blagodarenko@gmail.com> wrote:
>=20
> There are similar opening filesystem code in different utilities.
>=20
> The patch moves improved handling from try_open_fs()
> into ext2fs_open(). This function make one of the action
> based on parameters:
> 1) open filesystem with given superblock, superblock size
> 2) open filesystem with given superblock, but try to
> find right block size
>=20
> Signed-off-by: Artem Blagodarenko <c17828@cray.com>

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

> ---
> e2fsck/unix.c       | 28 +++-------------------------
> lib/ext2fs/openfs.c | 39 +++++++++++++++++++++++++++++++++++----
> misc/dumpe2fs.c     | 17 ++---------------
> 3 files changed, 40 insertions(+), 44 deletions(-)
>=20
> diff --git a/e2fsck/unix.c b/e2fsck/unix.c
> index 5b3552ec..ddcf52a4 100644
> --- a/e2fsck/unix.c
> +++ b/e2fsck/unix.c
> @@ -1151,31 +1151,9 @@ static errcode_t try_open_fs(e2fsck_t ctx, int =
flags, io_manager io_ptr,
> 			     ext2_filsys *ret_fs)
> {
> 	errcode_t retval;
> -
> -	*ret_fs =3D NULL;
> -	if (ctx->superblock && ctx->blocksize) {
> -		retval =3D ext2fs_open2(ctx->filesystem_name, =
ctx->io_options,
> -				      flags, ctx->superblock, =
ctx->blocksize,
> -				      io_ptr, ret_fs);
> -	} else if (ctx->superblock) {
> -		int blocksize;
> -		for (blocksize =3D EXT2_MIN_BLOCK_SIZE;
> -		     blocksize <=3D EXT2_MAX_BLOCK_SIZE; blocksize *=3D =
2) {
> -			if (*ret_fs) {
> -				ext2fs_free(*ret_fs);
> -				*ret_fs =3D NULL;
> -			}
> -			retval =3D ext2fs_open2(ctx->filesystem_name,
> -					      ctx->io_options, flags,
> -					      ctx->superblock, =
blocksize,
> -					      io_ptr, ret_fs);
> -			if (!retval)
> -				break;
> -		}
> -	} else
> -		retval =3D ext2fs_open2(ctx->filesystem_name, =
ctx->io_options,
> -				      flags, 0, 0, io_ptr, ret_fs);
> -
> +	retval =3D ext2fs_open2(ctx->filesystem_name, ctx->io_options,
> +			   flags, ctx->superblock, ctx->blocksize,
> +			   io_ptr, ret_fs);
> 	if (retval =3D=3D 0) {
> 		(*ret_fs)->priv_data =3D ctx;
> 		e2fsck_set_bitmap_type(*ret_fs, EXT2FS_BMAP64_RBTREE,
> diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
> index 85d73e2a..16d36200 100644
> --- a/lib/ext2fs/openfs.c
> +++ b/lib/ext2fs/openfs.c
> @@ -114,10 +114,10 @@ static void block_sha_map_free_entry(void *data)
>  *	EXT2_FLAG_64BITS - Allow 64-bit bitfields (needed for large
>  *				filesystems)
>  */
> -errcode_t ext2fs_open2(const char *name, const char *io_options,
> -		       int flags, int superblock,
> -		       unsigned int block_size, io_manager manager,
> -		       ext2_filsys *ret_fs)
> +static errcode_t __ext2fs_open2(const char *name, const char =
*io_options,
> +				int flags, int superblock,
> +				unsigned int block_size, io_manager =
manager,
> +				ext2_filsys *ret_fs)
> {
> 	ext2_filsys	fs;
> 	errcode_t	retval;
> @@ -515,6 +515,37 @@ cleanup:
> 	return retval;
> }
>=20
> +errcode_t ext2fs_open2(const char *name, const char *io_options,
> +		       int flags, int superblock,
> +		       unsigned int block_size, io_manager manager,
> +		       ext2_filsys *ret_fs)
> +{
> +	errcode_t retval;
> +
> +	*ret_fs =3D NULL;
> +	if (superblock && block_size) {
> +		retval =3D __ext2fs_open2(name, io_options,
> +				      flags, superblock, block_size,
> +				      manager, ret_fs);
> +	} else {
> +		int size;
> +
> +		for (size =3D EXT2_MIN_BLOCK_SIZE;
> +		     size <=3D EXT2_MAX_BLOCK_SIZE; size *=3D 2) {
> +			if (*ret_fs) {
> +				ext2fs_free(*ret_fs);
> +				*ret_fs =3D NULL;
> +			}
> +			retval =3D __ext2fs_open2(name, io_options, =
flags,
> +						superblock, size,
> +						manager, ret_fs);
> +			if (!retval)
> +				break;
> +		}
> +	}
> +	return retval;
> +}
> +
> /*
>  * Set/get the filesystem data I/O channel.
>  *
> diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c
> index 384ce925..183e2f6f 100644
> --- a/misc/dumpe2fs.c
> +++ b/misc/dumpe2fs.c
> @@ -667,21 +667,8 @@ int main (int argc, char ** argv)
> 	if (image_dump)
> 		flags |=3D EXT2_FLAG_IMAGE_FILE;
> try_open_again:
> -	if (use_superblock && !use_blocksize) {
> -		for (use_blocksize =3D EXT2_MIN_BLOCK_SIZE;
> -		     use_blocksize <=3D EXT2_MAX_BLOCK_SIZE;
> -		     use_blocksize *=3D 2) {
> -			retval =3D ext2fs_open (device_name, flags,
> -					      use_superblock,
> -					      use_blocksize, =
unix_io_manager,
> -					      &fs);
> -			if (!retval)
> -				break;
> -		}
> -	} else {
> -		retval =3D ext2fs_open(device_name, flags, =
use_superblock,
> -				     use_blocksize, unix_io_manager, =
&fs);
> -	}
> +	retval =3D ext2fs_open2(device_name, 0, flags, use_superblock,
> +			      use_blocksize, unix_io_manager, &fs);
> 	flags |=3D EXT2_FLAG_IGNORE_CSUM_ERRORS;
> 	if (retval && !retval_csum) {
> 		retval_csum =3D retval;
> --
> 2.14.3
>=20


Cheers, Andreas


--Apple-Mail=_518C01EE-D4D3-49EB-B727-660A010E6807
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+AFAlxRE28ACgkQcqXauRfM
H+DE6A//fQU/hHNd7+BLGC0SlTlosmT6mez8k3H77fL+Q4a6D6azIh3hI5VZ6A9w
FN5Q7ZABUKa6Q3Ei9lYuLtBt9rALZFNwIB3G3y17qxXWThEUBjXyZUn2f6/bBR2A
632Q61ClkJw8HYUz7AQqJSmiendMjL2SPWYi9wlnqCA3i788hqGF/1p60NjqFwZZ
d1/8IPhVGH2X/GT+nffQ3m2Ka9D3oyByZwAUEw2FsmOb7gn4Ls8Si1QMN80fVE4Y
DGcRTQQyY2/edpoIxjG+OEyFe1DgSkVMNnrfLAkqy86ioXO/gV05gsFVc3bw7n5n
tN47+IHVULQ88WU8n/qIOFtBfJ0eRqaclQLlNjw4rtolmbR3i8ohm7moNAPIY3w5
TJVLCgcmBLfHH1R7TFYzzyQC61b51yW/ZRzXpXDJAfoIPXSzO2LDbCYh1MMs8oyo
nDhj/O0hX5WoS4LueA0JP13imqbwjmaK3GWW9J0DHvwZ+Q0mx1/Ni2Vs/mJ31cZN
J2V0bl8BsSjkYF6E8a/VAkDjJ4Rn8WOzQL4PHZWuYGDGXFsFHnI8Z9tBGZDjdyw2
T6+jCQwhSW2vXyynsspyedAyPrMkp1b5ag+JMyhHGNHUN5e27QMlnz80FlzPvUCz
zPUEfclTOBD7u8P1g00XCcB0IV10CR9gE2fJRA5od0mkd7Nw6D0=
=56Yu
-----END PGP SIGNATURE-----

--Apple-Mail=_518C01EE-D4D3-49EB-B727-660A010E6807--