From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8600EC433EF for ; Thu, 16 Sep 2021 11:00:37 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A45E061242; Thu, 16 Sep 2021 11:00:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A45E061242 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1mQp7Y-00030Y-U0; Thu, 16 Sep 2021 11:00:00 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQp7X-00030S-Pu for linux-f2fs-devel@lists.sourceforge.net; Thu, 16 Sep 2021 10:59:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:In-Reply-To: MIME-Version:Date:Message-ID:From:References:To:Subject:Sender:Reply-To:Cc: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gtQny40lzwFmTI+WsXtV+ePog/Y5UkPXy8FKcYfA8Vg=; b=GDur4xSnOHzRX9W3JXcugAqHRM yHSeuQrYlhiPXWfMB2PYGL0BQy6R23GqH33Zm4QtC41dq88oJdLSxURG9D0P9qnedCdHizTIAt3KX 1dskhENG0V4qEUQvQdbdZwvQOMQO06yg5WEeJjEYi1eq5q4d5MNq+kxrkEvW5O7KhrP4=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=gtQny40lzwFmTI+WsXtV+ePog/Y5UkPXy8FKcYfA8Vg=; b=deAXMphn3ZoXsgTXG3I4jatUpM KMgHBPuKJywkbN6IakHWOuHxzCKlN4+4Lp347SyxPUp5qawnxiBr8Uo9XKlLsDPLy18l8u46w8H2w fOB6tW2Go33LlajW7yAKIujCuoWXdjNcqXK8/Rr0pkb3XBbToxOWmCjEWPeFSgnISZwM=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1mQp7V-0007V6-VL for linux-f2fs-devel@lists.sourceforge.net; Thu, 16 Sep 2021 10:59:59 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id A270861212; Thu, 16 Sep 2021 10:59:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631789990; bh=Dso/MFEmrD+TPpLZiUNF3849YovF0ga5MQNFvP6pZhE=; h=Subject:To:References:From:Date:In-Reply-To:From; b=aSrFY8CaiyUP3g0L0jfjUHFhACOH7ga8CW3jYAkmXEEs8rHJY+PSWUf0qXv0Tm3Vs 3Qv6ZGvaOYh6wKgh2gkeBGA2QK5PQRoNYyXrVf5KmmAypOq4vsyaoj+qtTx9CbOQQJ XroMlBL71qNb/T2EBkGJeSO/C/9olW1y2PSwnutEsoC1xEykNAGEi0jbPhGAdaWXoe 8PRK79nPkRy9wthNgyInLV/SzdK1AuQSGl6ZBdy+i42dKgdwdxJ8Kw6I5R+vwVbhh6 Fhsq/1DZNuFRXS4nBUtZkaunMA+ykMc3ffkCg4vku7x/FyVjhGrAmy8yTV+TQEhQJ1 c+fKwVidCFD4w== To: Jaegeuk Kim , linux-f2fs-devel@lists.sourceforge.net References: <20210910225618.501839-1-jaegeuk@kernel.org> From: Chao Yu Message-ID: <5ff26324-e8db-ef55-2c1f-c3f3e20a0863@kernel.org> Date: Thu, 16 Sep 2021 18:59:47 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20210910225618.501839-1-jaegeuk@kernel.org> Content-Language: en-US X-Headers-End: 1mQp7V-0007V6-VL Subject: Re: [f2fs-dev] [PATCH] mkfs.f2fs: wipe other FS magics given -f X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 2021/9/11 6:56, Jaegeuk Kim wrote: > This patch fixes the below stale magic info. > > $ mkfs.btrfs -f test.img > btrfs-progs v5.10.1 > See http://btrfs.wiki.kernel.org for more information. > > Label: (null) > UUID: 941d2db7-3ece-4090-8b22-c4ea548b5dae > Node size: 16384 > Sector size: 4096 > Filesystem size: 1.00GiB > Block group profiles: > Data: single 8.00MiB > Metadata: DUP 51.19MiB > System: DUP 8.00MiB > SSD detected: no > Incompat features: extref, skinny-metadata > Runtime features: > Checksum: crc32c > Number of devices: 1 > Devices: > ID SIZE PATH > 1 1.00GiB test.img > > $ hexdump -s 0x10000 -n 128 -C test.img > 00010000 81 29 94 0a 00 00 00 00 00 00 00 00 00 00 00 00 |.)..............| > 00010010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| > 00010020 94 1d 2d b7 3e ce 40 90 8b 22 c4 ea 54 8b 5d ae |..-.>.@.."..T.].| > 00010030 00 00 01 00 00 00 00 00 01 00 00 00 00 00 00 00 |................| > 00010040 5f 42 48 52 66 53 5f 4d 05 00 00 00 00 00 00 00 |_BHRfS_M........| > 00010050 00 40 d2 01 00 00 00 00 00 40 50 01 00 00 00 00 |.@.......@P.....| > 00010060 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| > 00010070 00 00 00 40 00 00 00 00 00 00 02 00 00 00 00 00 |...@............| > 00010080 > > $ mkfs.f2fs -t 0 -f test.img > > F2FS-tools: mkfs.f2fs Ver: 1.14.0 (2020-12-28) > > Info: Disable heap-based policy > Info: Debug level = 0 > Info: Trim is disabled > Info: Segments per section = 1 > Info: Sections per zone = 1 > Info: sector size = 512 > Info: total sectors = 2097152 (1024 MB) > Info: zone aligned segment0 blkaddr: 512 > Info: format version with > "Linux version 5.10.46-4rodete1-amd64 (glinux-team@google.com) (gcc-10 (Debian 10.2.1-6+build2) 10.2.1 20210110, GNU ld (GNU Binutils for Debian) 2.35.2) #1 SMP Debian 5.10.46-4rodete1 (2021-08-20)" > Info: Overprovision ratio = 6.360% > Info: Overprovision segments = 68 (GC reserved = 39) > Info: format successful > > $hexdump -s 0x10000 -n 128 -C test.img > 00010000 c2 8a c8 26 00 00 00 00 00 00 00 00 00 00 00 00 |...&............| > 00010010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| > 00010020 92 ab 3f c6 b7 82 49 5e 93 23 e8 c9 e9 45 7d ac |..?...I^.#...E}.| > 00010030 00 00 01 00 00 00 00 00 01 00 00 00 00 00 00 00 |................| > 00010040 5f 42 48 52 66 53 5f 4d 05 00 00 00 00 00 00 00 |_BHRfS_M........| > 00010050 00 40 d2 01 00 00 00 00 00 40 50 01 00 00 00 00 |.@.......@P.....| > 00010060 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| > 00010070 00 00 00 40 00 00 00 00 00 00 02 00 00 00 00 00 |...@............| > 00010080 > > --- After this patch --- > $ mkfs.f2fs -t 0 -f test.img > > F2FS-tools: mkfs.f2fs Ver: 1.14.0 (2020-12-28) > > Info: Disable heap-based policy > Info: Debug level = 0 > Info: Trim is disabled > test.img appears to contain an existing filesystem (btrfs). > Info: Segments per section = 1 > Info: Sections per zone = 1 > Info: sector size = 512 > Info: total sectors = 2097152 (1024 MB) > Info: zone aligned segment0 blkaddr: 512 > Info: format version with > "Linux version 5.10.46-4rodete1-amd64 (glinux-team@google.com) (gcc-10 (Debian 10.2.1-6+build2) 10.2.1 20210110, GNU ld (GNU Binutils for Debian) 2.35.2) #1 SMP Debian 5.10.46-4rodete1 (2021-08-20)" > Info: Overprovision ratio = 6.360% > Info: Overprovision segments = 68 (GC reserved = 39) > Info: format successful > > $ hexdump -s 0x10000 -n 128 -C test.img > 00010000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| > * > 00010080 > > Signed-off-by: Jaegeuk Kim > --- > fsck/main.c | 2 +- > include/f2fs_fs.h | 1 + > lib/libf2fs.c | 6 ++++++ > mkfs/f2fs_format_main.c | 26 ++++++++++++++++++++++---- > 4 files changed, 30 insertions(+), 5 deletions(-) > > diff --git a/fsck/main.c b/fsck/main.c > index eda399cf0679..e4cfdf443867 100644 > --- a/fsck/main.c > +++ b/fsck/main.c > @@ -1120,7 +1120,7 @@ int main(int argc, char **argv) > } > > /* Get device */ > - if (f2fs_get_device_info() < 0) { > + if (f2fs_get_device_info() < 0 || f2fs_get_f2fs_info() < 0) { > ret = -1; > if (c.func == FSCK) > ret = FSCK_OPERATIONAL_ERROR; > diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h > index 2a9c1169456c..69260a6fccd9 100644 > --- a/include/f2fs_fs.h > +++ b/include/f2fs_fs.h > @@ -1341,6 +1341,7 @@ extern int f2fs_devs_are_umounted(void); > extern int f2fs_dev_is_writable(void); > extern int f2fs_dev_is_umounted(char *); > extern int f2fs_get_device_info(void); > +extern int f2fs_get_f2fs_info(void); > extern unsigned int calc_extra_isize(void); > extern int get_device_info(int); > extern int f2fs_init_sparse_file(void); > diff --git a/lib/libf2fs.c b/lib/libf2fs.c > index b27785dec757..420dfdae56da 100644 > --- a/lib/libf2fs.c > +++ b/lib/libf2fs.c > @@ -1183,6 +1183,12 @@ int f2fs_get_device_info(void) > for (i = 0; i < c.ndevs; i++) > if (get_device_info(i)) > return -1; > + return 0; > +} > + > +int f2fs_get_f2fs_info(void) > +{ > + int i; > > if (c.wanted_total_sectors < c.total_sectors) { > MSG(0, "Info: total device sectors = %"PRIu64" (in %u bytes)\n", > diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c > index 031244d5d67a..de93f1b5b778 100644 > --- a/mkfs/f2fs_format_main.c > +++ b/mkfs/f2fs_format_main.c > @@ -396,18 +396,36 @@ int main(int argc, char *argv[]) > > c.func = MKFS; > > - if (!force_overwrite && f2fs_check_overwrite()) { > - MSG(0, "\tUse the -f option to force overwrite.\n"); > + if (f2fs_get_device_info() < 0) > return -1; > + > + if (f2fs_check_overwrite()) { > + char *zero_buf = NULL; > + int i; > + > + if (!force_overwrite) { > + MSG(0, "\tUse the -f option to force overwrite.\n"); > + goto err_format; > + } > + zero_buf = calloc(F2FS_BLKSIZE, 1); > + if (!zero_buf) { > + MSG(0, "\tFaile to allocate zero buffer.\n"); > + goto err_format; > + } > + /* wipe out other FS magics mostly first 4MB space */ > + for (i = 0; i < 1024; i++) > + dev_fill_block(zero_buf, i); if (dev_fill_block()) { free(zero_buf); MSG(0, "\tFaile to zeroout blocks.\n"); goto err_format; } > + free(zero_buf); > + f2fs_fsync_device(); if (f2fs_fsync_device()) { MSG(0, "\tFaile to fsync device.\n"); goto err_format; } Thanks, > } > > if (f2fs_devs_are_umounted() < 0) { > if (errno != EBUSY) > MSG(0, "\tError: Not available on mounted device!\n"); > - return -1; > + goto err_format; > } > > - if (f2fs_get_device_info() < 0) > + if (f2fs_get_f2fs_info() < 0) > goto err_format; > > /* > _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel