diff mbox series

generic/631: Remove useless nfs_export=off

Message ID 1619423823-21256-1-git-send-email-xuyang2018.jy@fujitsu.com (mailing list archive)
State New, archived
Headers show
Series generic/631: Remove useless nfs_export=off | expand

Commit Message

Yang Xu (Fujitsu) April 26, 2021, 7:57 a.m. UTC
The nfs_export feature was introduced since kernel v4.16-rc1 after
commit f168f1098dd9038 ("ovl: add support for "nfs_export" configuration").
On old kernel, this case will result in infinite loop because overlay
mount failed because of unrecognized mount options nfs_export=off.

In kernel documentation, overlay.rst said "the mount options index=off,nfs_export=on
are conflicting for a read-write mount and will result in an error.".
So using single index=off is also ok in here.

Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
 tests/generic/631 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Amir Goldstein April 26, 2021, 11:26 a.m. UTC | #1
On Mon, Apr 26, 2021 at 9:56 AM Yang Xu <xuyang2018.jy@fujitsu.com> wrote:
>
> The nfs_export feature was introduced since kernel v4.16-rc1 after
> commit f168f1098dd9038 ("ovl: add support for "nfs_export" configuration").
> On old kernel, this case will result in infinite loop because overlay
> mount failed because of unrecognized mount options nfs_export=off.
>
> In kernel documentation, overlay.rst said "the mount options index=off,nfs_export=on
> are conflicting for a read-write mount and will result in an error.".
> So using single index=off is also ok in here.
>
> Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
> ---
>  tests/generic/631 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/generic/631 b/tests/generic/631
> index c43f3de3..0fa47e49 100755
> --- a/tests/generic/631
> +++ b/tests/generic/631
> @@ -74,7 +74,7 @@ worker() {
>         local l="lowerdir=$SCRATCH_MNT/lowerdir:$SCRATCH_MNT/lowerdir1"
>         local u="upperdir=$SCRATCH_MNT/upperdir$tag"
>         local w="workdir=$SCRATCH_MNT/workdir$tag"
> -       local i="index=off,nfs_export=off"
> +       local i="index=off"

It's not clear to me why index=off is needed for the test.
I imagine that the mount options were copied from the container runtime,
which uses index=off as a workaround for mount failures due to leaked
overlayfs mounts. It doesn't look like this would be a concern for this test.

Anyway, removing nfs_export is fine, so

Reviewed-by: Amir Goldstein <amir73il@gmail.com>

Thanks,
Amir.
diff mbox series

Patch

diff --git a/tests/generic/631 b/tests/generic/631
index c43f3de3..0fa47e49 100755
--- a/tests/generic/631
+++ b/tests/generic/631
@@ -74,7 +74,7 @@  worker() {
 	local l="lowerdir=$SCRATCH_MNT/lowerdir:$SCRATCH_MNT/lowerdir1"
 	local u="upperdir=$SCRATCH_MNT/upperdir$tag"
 	local w="workdir=$SCRATCH_MNT/workdir$tag"
-	local i="index=off,nfs_export=off"
+	local i="index=off"
 
 	touch $SCRATCH_MNT/workers/$tag
 	while test -e $SCRATCH_MNT/running; do