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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=unavailable 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 12AEFC4361B for ; Sun, 20 Dec 2020 15:39:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF29923124 for ; Sun, 20 Dec 2020 15:39:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727663AbgLTPjw (ORCPT ); Sun, 20 Dec 2020 10:39:52 -0500 Received: from out20-50.mail.aliyun.com ([115.124.20.50]:36277 "EHLO out20-50.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727667AbgLTPjw (ORCPT ); Sun, 20 Dec 2020 10:39:52 -0500 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.074958|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_regular_dialog|0.0155462-0.00128685-0.983167;FP=0|0|0|0|0|-1|-1|-1;HT=ay29a033018047202;MF=guan@eryu.me;NM=1;PH=DS;RN=5;RT=5;SR=0;TI=SMTPD_---.J9OH26p_1608478746; Received: from localhost(mailfrom:guan@eryu.me fp:SMTPD_---.J9OH26p_1608478746) by smtp.aliyun-inc.com(10.147.41.120); Sun, 20 Dec 2020 23:39:06 +0800 Date: Sun, 20 Dec 2020 23:39:06 +0800 From: Eryu Guan To: Ritesh Harjani Cc: fstests@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, anju@linux.vnet.ibm.com Subject: Re: [PATCHv2 1/2] common/rc: Add whitelisted FS support in _require_scratch_swapfile() Message-ID: <20201220153906.GC3853@desktop> References: <3bd1f738-93b7-038d-6db9-7bf6a330b1ea@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3bd1f738-93b7-038d-6db9-7bf6a330b1ea@linux.ibm.com> Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Wed, Dec 16, 2020 at 10:53:45AM +0530, Ritesh Harjani wrote: > > > On 12/16/20 10:47 AM, Ritesh Harjani wrote: > > Filesystems e.g. ext4 and XFS supports swapon by default and an error > > returned with swapon should be treated as a failure. Hence > > add ext4/xfs as whitelisted fstype in _require_scratch_swapfile() > > > > Signed-off-by: Ritesh Harjani > > --- > > v1->v2: Addressed comments from Eryu @[1] > > [1]: https://patchwork.kernel.org/project/fstests/cover/cover.1604000570.git.riteshh@linux.ibm.com/ > > > > common/rc | 20 ++++++++++++++++---- > > 1 file changed, 16 insertions(+), 4 deletions(-) > > > > diff --git a/common/rc b/common/rc > > index 33b5b598a198..635b77a005c6 100644 > > --- a/common/rc > > +++ b/common/rc > > @@ -2380,6 +2380,7 @@ _format_swapfile() { > > # Check that the filesystem supports swapfiles > > _require_scratch_swapfile() > > { > > + local fstyp=$FSTYP > > _require_scratch > > _require_command "$MKSWAP_PROG" "mkswap" > > > > @@ -2401,10 +2402,21 @@ _require_scratch_swapfile() > > # Minimum size for mkswap is 10 pages > > _format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10)) > > > > - if ! swapon "$SCRATCH_MNT/swap" >/dev/null 2>&1; then > > - _scratch_unmount > > - _notrun "swapfiles are not supported" > > - fi > > + # For whitelisted fstyp swapon should not fail. > > + case "$fstyp" in > > + ext4|xfs) > > + if ! swapon "$SCRATCH_MNT/swap" >/dev/null 2>&1; then > > + _scratch_unmount > > + _fail "swapon failed for $fstyp" > > @Eryu, > As of now I added _fail() if swapon failed for given whitelisting fstype. > Do you think this is alright, or should I just ignore the error in I think it's reasonable. But I'd like to leave the patchset on the list for review for another week, to see if ext4 and/or xfs folks will chime in and have different thoughts. Thanks, Eryu > case of such FS? > > > > > + fi > > + ;; > > + *) > > + if ! swapon "$SCRATCH_MNT/swap" >/dev/null 2>&1; then > > + _scratch_unmount > > + _notrun "swapfiles are not supported" > > + fi > > + ;; > > + esac > > > > swapoff "$SCRATCH_MNT/swap" >/dev/null 2>&1 > > _scratch_unmount > > -- > > 2.26.2 > >