From: Eryu Guan <guaneryu@gmail.com>
To: Amir Goldstein <amir73il@gmail.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>,
linux-unionfs@vger.kernel.org, fstests@vger.kernel.org
Subject: Re: [PATCH v2 4/4] overlay/04{1,3,4}: enable xino feature
Date: Fri, 27 Apr 2018 10:43:04 +0800 [thread overview]
Message-ID: <20180427024304.GL11384@desktop> (raw)
In-Reply-To: <1524722007-30891-5-git-send-email-amir73il@gmail.com>
On Wed, Apr 25, 2018 at 11:53:27PM -0600, Amir Goldstein wrote:
> These tests check for constant inode number on copy up with nonsamefs
> layer configuration. This problem is fixes only when opting-in with the
> xino=on mount option, so let the tests enable the mount option on new
> kernels and notrun on old kernels.
>
> Signed-off-by: Amir Goldstein <amir73il@gmail.com>
> ---
> tests/overlay/041 | 16 ++++++++++++----
> tests/overlay/043 | 16 ++++++++++++----
> tests/overlay/044 | 16 ++++++++++++----
> 3 files changed, 36 insertions(+), 12 deletions(-)
>
> diff --git a/tests/overlay/041 b/tests/overlay/041
> index f3be746..78f8179 100755
> --- a/tests/overlay/041
> +++ b/tests/overlay/041
> @@ -70,7 +70,15 @@ _scratch_mkfs
> upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER
> workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK
>
> -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir
> +# Enabling xino in this test requires that base filesystem inode numbers will
> +# not use bit 63 in inode number of the test files, because bit 63 is used by
> +# overlayfs to indicate the layer. Let's just assume that this is true for all
> +# tested filesystems and if we are wrong, the test may fail.
> +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o xino=on ||
> + _notrun "mount overlay with xino failed"
The _notrun message seems to indicate there's a failure (I can see that
it's copied from _require_scratch_dax), which may confuse users. I can
change it to something like below on commit, if you have better messages
please advise :)
_notrun "cannot mount overlay with xino=on option"
> +# Not using _check_scratch_fs_option because it uses grep -w
> +_fs_options $SCRATCH_DEV | grep -q "xino=on" || \
> + _notrun "failed to enable xino"
_notrun "cannot enable xino feature"
Thanks,
Eryu
>
> test_dir=$SCRATCH_MNT/test_dir/
>
> @@ -171,7 +179,7 @@ subdir_d=$($here/src/t_dir_type $pure_lower_dir $pure_lower_subdir_st_ino)
> $UMOUNT_PROG $SCRATCH_MNT
>
> # check overlayfs
> -_overlay_check_scratch_dirs $lowerdir $upperdir $workdir
> +_overlay_check_scratch_dirs $lowerdir $upperdir $workdir -o xino=on
>
> # Verify pure lower residing in dir which has another lower layer
> middir=$OVL_BASE_TEST_DIR/$seq-ovl-mid
> @@ -186,7 +194,7 @@ mkdir -p $lowerdir/test_dir/pure_lower_dir/subdir
>
> _scratch_mkfs
>
> -_overlay_scratch_mount_dirs $middir:$lowerdir $upperdir $workdir
> +_overlay_scratch_mount_dirs $middir:$lowerdir $upperdir $workdir -o xino=on
>
> # Copy up test_dir
> touch $test_dir/test_file
> @@ -209,7 +217,7 @@ subdir_d=$($here/src/t_dir_type $pure_lower_dir $pure_lower_subdir_st_ino)
> echo "Pure lower in dir which has another lower layer: Invalid d_ino reported for subdir"
>
> # check overlayfs
> -_overlay_check_scratch_dirs "$middir:$lowerdir" $upperdir $workdir
> +_overlay_check_scratch_dirs "$middir:$lowerdir" $upperdir $workdir -o xino=on
>
> echo "Silence is golden"
> status=0
> diff --git a/tests/overlay/043 b/tests/overlay/043
> index f70ee7f..c865b51 100755
> --- a/tests/overlay/043
> +++ b/tests/overlay/043
> @@ -85,8 +85,16 @@ _scratch_mkfs >>$seqres.full 2>&1
> upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER
> workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK
>
> -# Enable redirect_dir for renaming a merge directory
> -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o redirect_dir=on
> +# Enable redirect_dir for renaming a merge directory.
> +# Enabling xino in this test requires that base filesystem inode numbers will
> +# not use bit 63 in inode number of the test files, because bit 63 is used by
> +# overlayfs to indicate the layer. Let's just assume that this is true for all
> +# tested filesystems and if we are wrong, the test may fail.
> +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o redirect_dir=on,xino=on || \
> + _notrun "mount overlay with xino failed"
> +# Not using _check_scratch_fs_option because it uses grep -w
> +_fs_options $SCRATCH_DEV | grep -q "xino=on" || \
> + _notrun "failed to enable xino"
>
> FILES="dir file symlink chrdev blkdev fifo socket"
>
> @@ -153,13 +161,13 @@ check_inode_numbers $testdir $tmp.after_copyup $tmp.after_move
>
> # Verify that the inode numbers survive a mount cycle
> $UMOUNT_PROG $SCRATCH_MNT
> -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o redirect_dir=on
> +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o redirect_dir=on,xino=on
>
> # Compare inode numbers before/after mount cycle
> check_inode_numbers $testdir $tmp.after_move $tmp.after_cycle
>
> # check overlayfs
> -_overlay_check_scratch_dirs $lowerdir $upperdir $workdir -o redirect_dir=on
> +_overlay_check_scratch_dirs $lowerdir $upperdir $workdir -o redirect_dir=on,xino=on
>
> echo "Silence is golden"
> status=0
> diff --git a/tests/overlay/044 b/tests/overlay/044
> index 2ab3035..bcc30ac 100755
> --- a/tests/overlay/044
> +++ b/tests/overlay/044
> @@ -99,8 +99,16 @@ _scratch_mkfs >>$seqres.full 2>&1
> upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER
> workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK
>
> -# Enable overlay index feature to prevent breaking hardlinks on copy up
> -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o index=on
> +# Enable overlay index feature to prevent breaking hardlinks on copy up.
> +# Enabling xino in this test requires that base filesystem inode numbers will
> +# not use bit 63 in inode number of the test files, because bit 63 is used by
> +# overlayfs to indicate the layer. Let's just assume that this is true for all
> +# tested filesystems and if we are wrong, the test may fail.
> +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o index=on,xino=on || \
> + _notrun "mount overlay with xino failed"
> +# Not using _check_scratch_fs_option because it uses grep -w
> +_fs_options $SCRATCH_DEV | grep -q "xino=on" || \
> + _notrun "failed to enable xino"
>
> rm -f $tmp.*
>
> @@ -124,8 +132,8 @@ check_ino_nlink $SCRATCH_MNT $tmp.before $tmp.after_one
>
> # Verify that the hardlinks survive a mount cycle
> $UMOUNT_PROG $SCRATCH_MNT
> -_overlay_check_scratch_dirs $lowerdir $upperdir $workdir -o index=on
> -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o index=on
> +_overlay_check_scratch_dirs $lowerdir $upperdir $workdir -o index=on,xino=on
> +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o index=on,xino=on
>
> echo "== After mount cycle =="
> cat $FILES
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2018-04-27 2:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 5:53 [PATCH v2 0/4] Fix failing overlay nonsamefs fstests Amir Goldstein
2018-04-26 5:53 ` [PATCH v2 1/4] common/rc: factor out _require_scratch_fs_option Amir Goldstein
2018-04-26 5:53 ` [PATCH v2 2/4] overlay/041: fix call to _overlay_check_scratch_dirs Amir Goldstein
2018-04-26 5:53 ` [PATCH v2 3/4] overlay/043: require and enable redirect_dir Amir Goldstein
2018-04-26 5:53 ` [PATCH v2 4/4] overlay/04{1,3,4}: enable xino feature Amir Goldstein
2018-04-27 2:43 ` Eryu Guan [this message]
2018-04-27 2:31 ` [PATCH v2 0/4] Fix failing overlay nonsamefs fstests Eryu Guan
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=20180427024304.GL11384@desktop \
--to=guaneryu@gmail.com \
--cc=amir73il@gmail.com \
--cc=fstests@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.