From patchwork Tue Jan 1 21:07:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Blagodarenko X-Patchwork-Id: 1019809 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="oknz+yfW"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Tmx20L0yz9rxp for ; Wed, 2 Jan 2019 08:08:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727519AbfAAVIF (ORCPT ); Tue, 1 Jan 2019 16:08:05 -0500 Received: from mail-it1-f194.google.com ([209.85.166.194]:53906 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725958AbfAAVIF (ORCPT ); Tue, 1 Jan 2019 16:08:05 -0500 Received: by mail-it1-f194.google.com with SMTP id g85so38930567ita.3 for ; Tue, 01 Jan 2019 13:08:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AHsM72VVvM4qlH8GjX9E7O698ZEqY2TacepaHRz2Y50=; b=oknz+yfWN0rGVMXS6s4M2OC5FTfbH+f0aO6yeUrbB7TL+LDAzx3u75JfDzKasYAkRW Ui+pNicdjH0WfnR/jaZarKmH0xNd9Q5aI0TIUhnVC9pFs5qCUf0CRXkHc4iD0KeUGJ/I dji3DUuGRU0GPPdH/qVwvLRYdpS+bRhsCj2IIQgaaw3jCvgoYObMjpp2Iy4pS5DlKaO3 6wPh7wPocnxbMTzQ8UbB/dLi81nOKpdAbDCd+ioII1y2qTeJIOdBcw+3TS6bi/+gZt4T ektUZwVJE3H8s7fRlDfEC9dpWindTWbA12dAeWaqONv1HPMdGp6NF8iX6Eyc8THw4KVv VbHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AHsM72VVvM4qlH8GjX9E7O698ZEqY2TacepaHRz2Y50=; b=uUY0jc4NA58Fa4rMJriUv1t0f88L+lb9ldLlKaoYDlN12MtSp0UFH86e5vp7fJDAvs eHZC6sODiMGeiVY++FlUvw23rinswwuCQZslUAAauC+XZnL2A6shjnLPXKrdTZyeyoSR o41lyyymYK9AqRMq1puu7I0VAl0ZS/046DSlUI7VnYuI3aedPqI7P0tAf5V2/N/as2qv cSjiO6jXoPsRJyEEfHRT+Nm9z0Y+TalMk+jPShC52T9kvbIWxa+PQI3OZ8q3UdX9uxnq V398qaAbfHtX7VeaNugInW6jEGrEa/jsMsq6+ctjdampjnHHobdc4lYEWtldIIImD0Lt BANg== X-Gm-Message-State: AJcUukeeiJmBaDxBmOJi0Ac+dB0JwrZGir8C+KlNQyfCoOgnOcdGe7T8 fAjhQaUg6uX2Ap8fnlTgoOfwxfcM5DA= X-Google-Smtp-Source: AFSGD/XbWzk4KiL60WhptyeTlYeQX0dOB+kbJo07mHqqwa7yxm3R0EKxzOumP7fhsin/ZRh+MQ8ZJA== X-Received: by 2002:a24:4545:: with SMTP id y66mr25219982ita.174.1546376884026; Tue, 01 Jan 2019 13:08:04 -0800 (PST) Received: from C02TN4C6HTD6.us.cray.com (seattle-nat.cray.com. [136.162.66.1]) by smtp.gmail.com with ESMTPSA id 137sm22289659itm.21.2019.01.01.13.08.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Jan 2019 13:08:03 -0800 (PST) From: Artem Blagodarenko X-Google-Original-From: Artem Blagodarenko To: linux-ext4@vger.kernel.org Cc: adilger.kernel@dilger.ca Subject: [PATCH v6 1/4] ext2fs: opening filesystem code refactoring Date: Tue, 1 Jan 2019 22:07:34 +0100 Message-Id: <20190101210737.87248-2-c17828@cray.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20190101210737.87248-1-c17828@cray.com> References: <20190101210737.87248-1-c17828@cray.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 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 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 | 41 +++++++++++++++++++++++++++++++++++++---- misc/dumpe2fs.c | 17 ++--------------- 3 files changed, 42 insertions(+), 44 deletions(-) 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 = 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 85d73e2a..7c16e386 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,39 @@ 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 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 |= 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); flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS; if (retval && !retval_csum) { retval_csum = retval;