From patchwork Fri May 25 12:42:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Blagodarenko X-Patchwork-Id: 920489 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MgFFh8jE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40smDt3DPGz9s01 for ; Fri, 25 May 2018 22:45:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933536AbeEYMoW (ORCPT ); Fri, 25 May 2018 08:44:22 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:39313 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933184AbeEYMoV (ORCPT ); Fri, 25 May 2018 08:44:21 -0400 Received: by mail-wm0-f66.google.com with SMTP id f8-v6so14291394wmc.4 for ; Fri, 25 May 2018 05:44:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=xnAHxcygHIZxjSRSQnOD5R+9xsSuoJDnOX9ol8x0DBQ=; b=MgFFh8jEnnqnOFg8Ilu70QkiBilQMsIRAdR65evUGX7DMj1/kvYUPXtX1S1XUTkKgq dEJSHX9t72LNR07hrGRJRpL5OaGVIFXlw3UUWSayjV8t48NfeZbdVbd8qcaCJPFna8nJ jGh4jQmG05QkYKtPtXAsxLpZnXJPg1Zox6bZzqAMjo2RVdnYdlgZ3w3rFSdVDmPnyaNf 5A5tiwJxXQ24TzLk7Mo0ExmyH4nar+S+C3XzPm7Eu3YByrZXFjmlM4ODHECcAQ71EG+V QOj2Nsd8OtnOefLUq4WCkGb6jiJ2jkrSUaZvmrCM8Eac8l8MnJSC/9HxFWiJeJK0ix3C fDrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=xnAHxcygHIZxjSRSQnOD5R+9xsSuoJDnOX9ol8x0DBQ=; b=QukTt2aeu+9zLomEX1/1JCp1As4XqILfexH+tyZ1BWGdMGK1CweDSIl7ORyhBiV05d ZO8EzJWIUYVZFLKaTj/1l95uVoW8KeKFCqajwpINcPXM+Vc527WAayjVe6QBk1nscgfr E5V7eTKxzgTdr7Ggx6ATR29smFOM2Xi5G3R1u6sgz9aKyGMpieKL0TxTAefhI+xKm+WT wxsEQ5y7Wmo1VqXZS1aJ8rVvpmyAb/lG0rQe4zZsbwicHPyNyivyQaKxxdi/Kc074BXG yLZGfOjGkUMPJmlpo60Tnd9FOllLWvE4bCEsy6vPMbIP1R6cSVmLSLWeGsXCBnqcLCZd KRmQ== X-Gm-Message-State: ALKqPwd9/iJMpPA4EFUTrfsLmltSih2Rn9n2JDgJfMsblPRNTHCEB5lx KCNJe/elc7S0dkNfvazkgXouTA== X-Google-Smtp-Source: AB8JxZpxF1pOCgmj7sMmEb+92O5jynadi9CJrKnsLouLd4O0YAsRvRt56uvIY96VHSG0K1U1dCr/pg== X-Received: by 2002:a2e:781a:: with SMTP id t26-v6mr1617477ljc.74.1527252259904; Fri, 25 May 2018 05:44:19 -0700 (PDT) Received: from C02TN4C6HTD6.lan ([91.105.193.141]) by smtp.gmail.com with ESMTPSA id e7-v6sm4392662ljj.95.2018.05.25.05.44.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 May 2018 05:44:19 -0700 (PDT) From: Artem Blagodarenko To: linux-ext4@vger.kernel.org Subject: [PATCH v4 1/4] ext2fs: opening filesystem code refactoring Date: Fri, 25 May 2018 15:42:22 +0300 Message-Id: <20180525124225.31089-2-artem.blagodarenko@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180525124225.31089-1-artem.blagodarenko@gmail.com> References: <20180525124225.31089-1-artem.blagodarenko@gmail.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org There are similar opening filesystem code in different utilities. The patch moves this code to ext2fs_try_open_fs(). 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 3) open filesystem with default superblock and block size Signed-off-by: Artem Blagodarenko Reviewed-by: Andreas Dilger --- e2fsck/unix.c | 28 +++------------------------- lib/ext2fs/openfs.c | 36 +++++++++++++++++++++++++++++++++++- misc/dumpe2fs.c | 17 +++-------------- 3 files changed, 41 insertions(+), 40 deletions(-) diff --git a/e2fsck/unix.c b/e2fsck/unix.c index cbe5ec50..491e9eb6 100644 --- a/e2fsck/unix.c +++ b/e2fsck/unix.c @@ -1142,31 +1142,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 = NULL; - if (ctx->superblock && ctx->blocksize) { - retval = 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 = EXT2_MIN_BLOCK_SIZE; - blocksize <= EXT2_MAX_BLOCK_SIZE; blocksize *= 2) { - if (*ret_fs) { - ext2fs_free(*ret_fs); - *ret_fs = NULL; - } - retval = ext2fs_open2(ctx->filesystem_name, - ctx->io_options, flags, - ctx->superblock, blocksize, - io_ptr, ret_fs); - if (!retval) - break; - } - } else - retval = ext2fs_open2(ctx->filesystem_name, ctx->io_options, - flags, 0, 0, io_ptr, ret_fs); - + retval = ext2fs_open2(ctx->filesystem_name, ctx->io_options, + flags, ctx->superblock, ctx->blocksize, + io_ptr, ret_fs); if (retval == 0) { (*ret_fs)->priv_data = ctx; e2fsck_set_bitmap_type(*ret_fs, EXT2FS_BMAP64_RBTREE, diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c index 532e70f7..d18e1ad2 100644 --- a/lib/ext2fs/openfs.c +++ b/lib/ext2fs/openfs.c @@ -108,7 +108,7 @@ errcode_t ext2fs_open(const char *name, int flags, int superblock, * EXT2_FLAG_64BITS - Allow 64-bit bitfields (needed for large * filesystems) */ -errcode_t ext2fs_open2(const char *name, const char *io_options, +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) @@ -504,6 +504,40 @@ cleanup: return retval; } +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 = NULL; + if (superblock && block_size) { + retval = __ext2fs_open2(name, io_options, + flags, superblock, block_size, + manager, ret_fs); + } else if (superblock) { + int block_size; + + for (block_size = EXT2_MIN_BLOCK_SIZE; + block_size <= EXT2_MAX_BLOCK_SIZE; block_size *= 2) { + if (*ret_fs) { + ext2fs_free(*ret_fs); + *ret_fs = NULL; + } + retval = __ext2fs_open2(name, + io_options, flags, + superblock, block_size, + manager, ret_fs); + if (!retval) + break; + } + } else + retval = __ext2fs_open2(name, io_options, + flags, 0, 0, manager, ret_fs); + return retval; +} + /* * Set/get the filesystem data I/O channel. * diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c index 395ea9ee..6c4d7965 100644 --- a/misc/dumpe2fs.c +++ b/misc/dumpe2fs.c @@ -568,20 +568,9 @@ int main (int argc, char ** argv) if (image_dump) flags |= EXT2_FLAG_IMAGE_FILE; try_open_again: - if (use_superblock && !use_blocksize) { - for (use_blocksize = EXT2_MIN_BLOCK_SIZE; - use_blocksize <= EXT2_MAX_BLOCK_SIZE; - use_blocksize *= 2) { - retval = ext2fs_open (device_name, flags, - use_superblock, - use_blocksize, unix_io_manager, - &fs); - if (!retval) - break; - } - } else - retval = ext2fs_open (device_name, flags, use_superblock, - use_blocksize, unix_io_manager, &fs); + retval = ext2fs_open2(device_name, 0, + flags, use_superblock, use_blocksize, + unix_io_manager, &fs); if (retval && !(flags & EXT2_FLAG_IGNORE_CSUM_ERRORS)) { flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS; goto try_open_again;