overlay/029: fix test failure with nfs_export feature enabled

When overlayfs nfs_export feature is enabled by default in either kernel
config or module parameters, this test fails:

    mount: /tmp/8751/mnt: mount(2) system call failed: Stale file handle.
    cat: /tmp/8751/mnt/bar: No such file or directory

The reason is that nfs_export depends on index feature and with index
feature enabled, an upper/work dirs cannot be reused for mounting with
a different lower layer.

To reproduce the failure do:
  echo Y > /sys/module/overlay/parameters/index
  echo Y > /sys/module/overlay/parameters/nfs_export
before running the test.

Fix the failure by explicitly re-creating upper/work dirs.

Reported-by: Chengguang Xu <cgxu519@mykernel.net>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Amir Goldstein
2020-04-20 13:27:31 +03:00
committed by Eryu Guan
parent 50a059ceac
commit f3bdafb91b
+6
View File
@@ -68,12 +68,18 @@ _overlay_mount_dirs $SCRATCH_MNT/up $tmp/{upper,work} \
cat $tmp/mnt/foo
$UMOUNT_PROG $tmp/mnt
# re-create upper/work to avoid ovl_verify_origin() mount failure
# when index is enabled
rm -rf $tmp/{upper,work}
mkdir -p $tmp/{upper,work}
# mount overlay again using lower dir from SCRATCH_MNT dir
_overlay_mount_dirs $SCRATCH_MNT/low $tmp/{upper,work} \
overlay $tmp/mnt
cat $tmp/mnt/bar
$UMOUNT_PROG $tmp/mnt
rm -rf $tmp/{upper,work}
mkdir -p $tmp/{upper,work}
# mount overlay again using SCRATCH_MNT dir
_overlay_mount_dirs $SCRATCH_MNT/ $tmp/{upper,work} \
overlay $tmp/mnt