From patchwork Fri Dec 14 07:57:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 10730701 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 0BE5315A6 for ; Fri, 14 Dec 2018 08:36:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0A9A2C964 for ; Fri, 14 Dec 2018 08:36:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E48972D10F; Fri, 14 Dec 2018 08:36:28 +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 783DB2C964 for ; Fri, 14 Dec 2018 08:36:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727216AbeLNIg2 (ORCPT ); Fri, 14 Dec 2018 03:36:28 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:47210 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726494AbeLNIg2 (ORCPT ); Fri, 14 Dec 2018 03:36:28 -0500 X-IronPort-AV: E=Sophos;i="5.56,352,1539619200"; d="scan'208";a="49763412" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 14 Dec 2018 16:36:25 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 530D64B7349D; Fri, 14 Dec 2018 16:36:27 +0800 (CST) Received: from RHEL7U5GA_Intel64.g08.fujitsu.local (10.167.220.156) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 14 Dec 2018 16:36:26 +0800 From: Xiao Yang To: CC: , , Xiao Yang Subject: [PATCH v2] common/rc: Fix mismatched output from standard mkswap Date: Fri, 14 Dec 2018 15:57:27 +0800 Message-ID: <1544774247-14706-1-git-send-email-yangx.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <20180607095207.GH2861@desktop> References: <20180607095207.GH2861@desktop> MIME-Version: 1.0 X-Originating-IP: [10.167.220.156] X-yoursite-MailScanner-ID: 530D64B7349D.A9B6D X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: yangx.jy@cn.fujitsu.com Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With older util-linux(e.g. v2.17.2), running some tests(e.g. generic/472, generic/495) 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 ------------------------------------------------------- 1) Before commit c1f1b30 of util-linux, mkswap didn't zap bootbits sectors and printed a warning until force option(i.e. -f) was given. We try to add the force option. 2) With mounting default SELinux context(e.g. system_u:object_r:root_t:s0), standard mkswap tried to reset the type of default context to swapfile_t if it is not swapfile_t, and then it failed and returned ENOTSUP expectedly as we don't want to create any SELinux attr on purpose. standard mkswap ignored this relabel error by commit d97dc0e of util-linux, but it still reported the error before commit d97dc0e. We try to skip the reset step in standard mkswap by mounting swapfile context. Note: We just mount swapfile context in related tests, and keep default context in the rest of tests. Signed-off-by: Xiao Yang --- common/rc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/rc b/common/rc index e5da648..4bdb870 100644 --- a/common/rc +++ b/common/rc @@ -2210,7 +2210,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 } # Check that the filesystem supports swapfiles @@ -2219,6 +2219,8 @@ _require_scratch_swapfile() _require_scratch _scratch_mkfs >/dev/null + [ -n "$SELINUX_MOUNT_OPTIONS" ] && export \ + SELINUX_MOUNT_OPTIONS="-o context=system_u:object_r:swapfile_t:s0" _scratch_mount # Minimum size for mkswap is 10 pages