From: Eryu Guan <eguan@linux.alibaba.com>
To: Pavel Reichl <preichl@redhat.com>
Cc: fstests@vger.kernel.org, zlang@redhat.com, guan@eryu.me
Subject: Re: [PATCH v2 3/4] generic/554: hide permision warning on exfat
Date: Thu, 1 Apr 2021 11:40:32 +0800 [thread overview]
Message-ID: <20210401034032.GP95214@e18g06458.et15sqa> (raw)
In-Reply-To: <20210330220005.56019-4-preichl@redhat.com>
On Wed, Mar 31, 2021 at 12:00:04AM +0200, Pavel Reichl wrote:
> Signed-off-by: Pavel Reichl <preichl@redhat.com>
> ---
> common/rc | 13 +++++++++++++
> tests/generic/554 | 3 ++-
> 2 files changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/common/rc b/common/rc
> index 2d658711..379140ea 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -2401,6 +2401,19 @@ _format_swapfile() {
> fi
> }
>
> +_format_swapon_file() {
It's not a "format" action anymore, the _format prefix seems misleading.
I think _swapon_file seems fine.
Thanks,
Eryu
> + local fname="$1"
> +
> + if [ "$FSTYP" = "exfat" ]; then
> + # exfat does not support posix file permisions, so warning is
> + # to be expected
> + swapon "$fname" |& grep -v "insecure permissions"
> + else
> + swapon "$fname"
> + fi
> +
> +}
> +
> # Check that the filesystem supports swapfiles
> _require_scratch_swapfile()
> {
> diff --git a/tests/generic/554 b/tests/generic/554
> index fa4f97d2..c2f9eee8 100755
> --- a/tests/generic/554
> +++ b/tests/generic/554
> @@ -46,7 +46,8 @@ $XFS_IO_PROG -f -c "pwrite -S 0x61 0 128k" $SCRATCH_MNT/file >> $seqres.full 2>&
>
> echo swap files return ETXTBUSY
> _format_swapfile $SCRATCH_MNT/swapfile 16m
> -swapon $SCRATCH_MNT/swapfile
> +_format_swapon_file $SCRATCH_MNT/swapfile
> +
> $XFS_IO_PROG -f -c "copy_range -l 32k $SCRATCH_MNT/file" $SCRATCH_MNT/swapfile
> swapoff $SCRATCH_MNT/swapfile
>
> --
> 2.30.2
next prev parent reply other threads:[~2021-04-01 3:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-30 22:00 [PATCH v2 0/4] Fix some tests that fail for exfat FS Pavel Reichl
2021-03-30 22:00 ` [PATCH v2 1/4] common/rc: Add _require_{chown,chmod,symlink}() Pavel Reichl
2021-03-31 0:25 ` Zorro Lang
2021-03-31 7:17 ` Pavel Reichl
2021-04-01 3:38 ` Eryu Guan
2021-04-01 9:47 ` Pavel Reichl
2021-04-07 16:47 ` Eric Sandeen
2021-03-30 22:00 ` [PATCH v2 2/4] common: hide permision warning from mkswap for exfat Pavel Reichl
2021-04-07 17:03 ` Eric Sandeen
2021-04-15 9:15 ` Pavel Reichl
2021-03-30 22:00 ` [PATCH v2 3/4] generic/554: hide permision warning on exfat Pavel Reichl
2021-04-01 3:40 ` Eryu Guan [this message]
2021-03-30 22:00 ` [PATCH v2 4/4] generic/003: Amend the test for exfat Pavel Reichl
2021-04-07 18:03 ` Eric Sandeen
2021-04-15 9:14 ` Pavel Reichl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210401034032.GP95214@e18g06458.et15sqa \
--to=eguan@linux.alibaba.com \
--cc=fstests@vger.kernel.org \
--cc=guan@eryu.me \
--cc=preichl@redhat.com \
--cc=zlang@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).