From: Alexander Larsson <alexl@redhat.com>
To: Amir Goldstein <amir73il@gmail.com>, Zorro Lang <zlang@redhat.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>,
linux-unionfs@vger.kernel.org, fstests@vger.kernel.org
Subject: Re: [PATCH] overlay/084: Fix test to match new xwhiteouts dir on-disk format
Date: Mon, 05 Feb 2024 11:17:14 +0100 [thread overview]
Message-ID: <5820c922adf390c825441809b224263b2b4d7947.camel@redhat.com> (raw)
In-Reply-To: <20240203081228.1725872-1-amir73il@gmail.com>
On Sat, 2024-02-03 at 10:12 +0200, Amir Goldstein wrote:
> The xwhiteouts feature, which is tested in this test, was added to
> overlayfs in kernel v6.7.
>
> The on-disk format of the xwhiteouts directory was changed in kernel
> v6.8-rc2, specfically by commit 420332b94119 ("ovl: mark xwhiteouts
> directory with overlay.opaque='x'") and backported to kernel v6.7.3,
> so this test now fails on kernel >= v6.8-rc2 and => v6.7.3.
>
> Adapt the test to the new on-disk format and add a hint to make sure
> that the on-disk format change is backported to v6.7 based kernels.
>
> Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Acked-by: Alexander Larsson <alexl@redhat.com>
> ---
> tests/overlay/084 | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/tests/overlay/084 b/tests/overlay/084
> index 8465caeb..778396a1 100755
> --- a/tests/overlay/084
> +++ b/tests/overlay/084
> @@ -25,6 +25,11 @@ _cleanup()
>
> # real QA test starts here
> _supported_fs overlay
> +# This test does not run on kernels prior ro v6.7 and now it will
> also make sure
> +# that the following on-disk format change was backported to v6.7
> based kernels
> +_fixed_by_kernel_commit 420332b94119 \
> + "ovl: mark xwhiteouts directory with overlay.opaque='x'"
> +
> # We use non-default scratch underlying overlay dirs, we need to
> check
> # them explicity after test.
> _require_scratch_nocheck
> @@ -115,7 +120,8 @@ do_test_xwhiteout()
>
> mkdir -p $basedir/lower $basedir/upper $basedir/work
> touch $basedir/lower/regular $basedir/lower/hidden
> $basedir/upper/hidden
> - setfattr -n $prefix.overlay.whiteouts -v "y" $basedir/upper
> + # overlay.opaque="x" means directory has xwhiteout children
> + setfattr -n $prefix.overlay.opaque -v "x" $basedir/upper
> setfattr -n $prefix.overlay.whiteout -v "y"
> $basedir/upper/hidden
>
> # Test the hidden is invisible
--
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
=-=-=
Alexander Larsson Red Hat,
Inc
alexl@redhat.com alexander.larsson@gmail.com
He's a time-tossed vegetarian rock star with a mysterious suitcase
handcuffed to his arm. She's a tortured foul-mouthed mercenary with the
power to see death. They fight crime!
prev parent reply other threads:[~2024-02-05 10:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-03 8:12 [PATCH] overlay/084: Fix test to match new xwhiteouts dir on-disk format Amir Goldstein
2024-02-05 10:17 ` Alexander Larsson [this message]
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=5820c922adf390c825441809b224263b2b4d7947.camel@redhat.com \
--to=alexl@redhat.com \
--cc=amir73il@gmail.com \
--cc=fstests@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).