From patchwork Tue May 14 13:58:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 10943047 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7173E6C5 for ; Tue, 14 May 2019 13:58:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F8BF2871A for ; Tue, 14 May 2019 13:58:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 534D428722; Tue, 14 May 2019 13:58:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E91C72871A for ; Tue, 14 May 2019 13:58:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726148AbfENN6I (ORCPT ); Tue, 14 May 2019 09:58:08 -0400 Received: from mx2.suse.de ([195.135.220.15]:53448 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725901AbfENN6I (ORCPT ); Tue, 14 May 2019 09:58:08 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 58621AFA1 for ; Tue, 14 May 2019 13:58:07 +0000 (UTC) From: Johannes Thumshirn To: David Sterba Cc: Linux BTRFS Mailinglist , Johannes Thumshirn Subject: [PATCH v3.1 1/3] btrfs-progs: factor out super_block reading from load_and_dump_sb Date: Tue, 14 May 2019 15:58:04 +0200 Message-Id: <20190514135804.18669-1-jthumshirn@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190514132532.16934-2-jthumshirn@suse.de> References: <20190514132532.16934-2-jthumshirn@suse.de> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP inspect-internal dump-superblock's load_and_dump_sb() already reads a super block from a file descriptor and places it into a 'struct btrfs_super_block'. For inspect-internal dump-csum we need this super block as well but don't care about printing it. Separate the read from the dump phase so we can re-use it elsewhere. Signed-off-by: Johannes Thumshirn Reviewed-by: Nikolay Borisov --- - Fix double sizeof() @!$#$ (Nikolay) cmds-inspect-dump-super.c | 15 ++++++--------- utils.c | 15 +++++++++++++++ utils.h | 2 ++ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c index 7815c863f2ed..879f979f526a 100644 --- a/cmds-inspect-dump-super.c +++ b/cmds-inspect-dump-super.c @@ -477,16 +477,13 @@ static void dump_superblock(struct btrfs_super_block *sb, int full) static int load_and_dump_sb(char *filename, int fd, u64 sb_bytenr, int full, int force) { - u8 super_block_data[BTRFS_SUPER_INFO_SIZE]; - struct btrfs_super_block *sb; + struct btrfs_super_block sb; u64 ret; - sb = (struct btrfs_super_block *)super_block_data; - - ret = pread64(fd, super_block_data, BTRFS_SUPER_INFO_SIZE, sb_bytenr); - if (ret != BTRFS_SUPER_INFO_SIZE) { + ret = load_sb(fd, sb_bytenr, &sb); + if (ret) { /* check if the disk if too short for further superblock */ - if (ret == 0 && errno == 0) + if (ret == -ENOSPC) return 0; error("failed to read the superblock on %s at %llu", @@ -496,11 +493,11 @@ static int load_and_dump_sb(char *filename, int fd, u64 sb_bytenr, int full, } printf("superblock: bytenr=%llu, device=%s\n", sb_bytenr, filename); printf("---------------------------------------------------------\n"); - if (btrfs_super_magic(sb) != BTRFS_MAGIC && !force) { + if (btrfs_super_magic(&sb) != BTRFS_MAGIC && !force) { error("bad magic on superblock on %s at %llu", filename, (unsigned long long)sb_bytenr); } else { - dump_superblock(sb, full); + dump_superblock(&sb, full); } return 0; } diff --git a/utils.c b/utils.c index 9e26c884cc6c..f0ae53ded315 100644 --- a/utils.c +++ b/utils.c @@ -2593,3 +2593,18 @@ void print_all_devices(struct list_head *devices) print_device_info(dev, "\t"); printf("\n"); } + +int load_sb(int fd, u64 bytenr, struct btrfs_super_block *sb) +{ + size_t size = sizeof(struct btrfs_super_block); + int ret; + + ret = pread64(fd, sb, size, bytenr); + if (ret != size) { + if (ret == 0 && errno == 0) + return -EINVAL; + + return -errno; + } + return 0; +} diff --git a/utils.h b/utils.h index 7c5eb798557d..f0b9ec372893 100644 --- a/utils.h +++ b/utils.h @@ -171,6 +171,8 @@ unsigned long total_memory(void); void print_device_info(struct btrfs_device *device, char *prefix); void print_all_devices(struct list_head *devices); +int load_sb(int fd, u64 bytenr, struct btrfs_super_block *sb); + /* * Global program state, configurable by command line and available to * functions without extra context passing.