| Message ID | 20210417164655.64065-1-xifeng@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1] common/rc: not run swapfile test for DAX | expand |
On Sat, Apr 17, 2021 at 12:46:55PM -0400, xifeng@redhat.com wrote: > From: root <root@hp-dl385pg8-01.rhts.eng.pek2.redhat.com> > > DAX doesn't support swapfile. Without this patch, > _require_scratch_swapfile always returns fail for fsdax. Now > change to notrun. > > Signed-off-by: root <root@hp-dl385pg8-01.rhts.eng.pek2.redhat.com> Who? > --- > common/rc | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/common/rc b/common/rc > index 23f86ce6..d02b9f72 100644 > --- a/common/rc > +++ b/common/rc > @@ -2384,7 +2384,11 @@ _require_scratch_swapfile() > ext2|ext3|ext4|xfs) > if ! swapon "$SCRATCH_MNT/swap" >/dev/null 2>&1; then > _scratch_unmount > - _fail "swapon failed for $FSTYP" > + if _normalize_mount_options | egrep -q "dax(=always| |$)"; then Doesn't the STATX_ATTR_DAX test above take care of this? --D > + _notrun "swapfiles are not supported" > + else > + _fail "swapon failed for $FSTYP" > + fi > fi > ;; > *) > -- > 2.27.0 >
Hi, ----- Original Message ----- > From: "Darrick J. Wong" <djwong@kernel.org> > To: xifeng@redhat.com > Cc: fstests@vger.kernel.org > Sent: Sunday, April 18, 2021 12:54:58 AM > Subject: Re: [PATCH v1] common/rc: not run swapfile test for DAX > > On Sat, Apr 17, 2021 at 12:46:55PM -0400, xifeng@redhat.com wrote: > > From: root <root@hp-dl385pg8-01.rhts.eng.pek2.redhat.com> > > > > DAX doesn't support swapfile. Without this patch, > > _require_scratch_swapfile always returns fail for fsdax. Now > > change to notrun. > > > > Signed-off-by: root <root@hp-dl385pg8-01.rhts.eng.pek2.redhat.com> > > Who? Please ignore it. It's added automatically by my client. > > > --- > > common/rc | 6 +++++- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/common/rc b/common/rc > > index 23f86ce6..d02b9f72 100644 > > --- a/common/rc > > +++ b/common/rc > > @@ -2384,7 +2384,11 @@ _require_scratch_swapfile() > > ext2|ext3|ext4|xfs) > > if ! swapon "$SCRATCH_MNT/swap" >/dev/null 2>&1; then > > _scratch_unmount > > - _fail "swapon failed for $FSTYP" > > + if _normalize_mount_options | egrep -q "dax(=always| |$)"; then > > Doesn't the STATX_ATTR_DAX test above take care of this? Yes, need to consider STATX_ATTR_DAX. I will update it. Thanks. > > --D > > > + _notrun "swapfiles are not supported" > > + else > > + _fail "swapon failed for $FSTYP" > > + fi > > fi > > ;; > > *) > > -- > > 2.27.0 > > > >
diff --git a/common/rc b/common/rc index 23f86ce6..d02b9f72 100644 --- a/common/rc +++ b/common/rc @@ -2384,7 +2384,11 @@ _require_scratch_swapfile() ext2|ext3|ext4|xfs) if ! swapon "$SCRATCH_MNT/swap" >/dev/null 2>&1; then _scratch_unmount - _fail "swapon failed for $FSTYP" + if _normalize_mount_options | egrep -q "dax(=always| |$)"; then + _notrun "swapfiles are not supported" + else + _fail "swapon failed for $FSTYP" + fi fi ;; *)