From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl0-f65.google.com ([209.85.160.65]:43719 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751681AbeFGJwP (ORCPT ); Thu, 7 Jun 2018 05:52:15 -0400 Received: by mail-pl0-f65.google.com with SMTP id c41-v6so5793964plj.10 for ; Thu, 07 Jun 2018 02:52:15 -0700 (PDT) Date: Thu, 7 Jun 2018 17:52:07 +0800 From: Eryu Guan Subject: Re: [PATCH] common/rc: Fix mismatched output from standard mkswap Message-ID: <20180607095207.GH2861@desktop> References: <1528190505-20483-1-git-send-email-yangx.jy@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1528190505-20483-1-git-send-email-yangx.jy@cn.fujitsu.com> Sender: fstests-owner@vger.kernel.org To: Xiao Yang Cc: fstests@vger.kernel.org, osandov@fb.com List-ID: On Tue, Jun 05, 2018 at 05:21:45PM +0800, Xiao Yang wrote: > Running generic/495 with EXT4 on RHEL6 got the following output: > ---------------------------------------------------------------- > ... > +mkswap: /mnt/xfstests/scratch/swap: warning: don't erase bootbits sectors > + on whole disk. Use -f to force. > +mkswap: unable to relabel /mnt/xfstests/scratch/swap to system_u:object_r:swapfile_t:s0: Operation not supported > ... > ---------------------------------------------------------------- > > Before commit c1f1b30 of util-linux, mkswap didn't zap bootbits sectors > and printed a warning until force option(i.e. -f) was given, so we add > the force option. > > Before commit d97dc0e of util-linux, mkswap failed to relabel SELinux > labeling when the underlying filesystem didn't support it. We avoid > default fs-wide context set in xfstests by mounting manually. > > Signed-off-by: Xiao Yang > --- > common/rc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/common/rc b/common/rc > index 9273ff7..6a20454 100644 > --- a/common/rc > +++ b/common/rc > @@ -2216,7 +2216,7 @@ _format_swapfile() { > # Swap files must be nocow on Btrfs. > $CHATTR_PROG +C "$fname" > /dev/null 2>&1 > _pwrite_byte 0x61 0 "$sz" "$fname" >> $seqres.full > - mkswap "$fname" >> $seqres.full > + mkswap -f "$fname" >> $seqres.full > } This part looks fine. > > # Check that the filesystem supports swapfiles > @@ -2225,7 +2225,7 @@ _require_scratch_swapfile() > _require_scratch > > _scratch_mkfs >/dev/null > - _scratch_mount > + _mount $SCRATCH_DEV $SCRATCH_MNT But this breaks test on overlay, it fails to mount overlayfs. And I manually revert d97dc0e and build mkswap from util-linux, and test with ext4, but I didn't reproduce the failure. It seems it only happens when underlying filesystem doesn't support extend attr? (I don't have a RHEL6 env by hand..). Thanks, Eryu > > # Minimum size for mkswap is 10 pages > _format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10)) > -- > 1.8.3.1 > > > > -- > To unsubscribe from this list: send the line "unsubscribe fstests" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html