linux-ext4 - [PATCH 8/9] runtests.sh: Fix when SCRATCH_DEV

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <5eab116f5daa4cf36adde6e5175a88ee1df60e7c.1624007533.git.riteshh@linux.ibm.com>
Date:   Fri, 18 Jun 2021 16:39:59 +0530
From:   Ritesh Harjani <riteshh@...ux.ibm.com>
To:     "Theodore Ts'o" <tytso@....edu>
Cc:     fstests@...r.kernel.org, linux-ext4@...r.kernel.org,
        Ritesh Harjani <riteshh@...ux.ibm.com>
Subject: [PATCH 8/9] runtests.sh: Fix when SCRATCH_DEV_POOL is passed

btrfs may need more than 1 disk which mostly needs to be passed via
SCRATCH_DEV_POOL. In such case we should not set SCRATCH_DEV [1].

[1]: https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/tree/README#n55

Signed-off-by: Ritesh Harjani <riteshh@...ux.ibm.com>
---
 kvm-xfstests/test-appliance/files/root/runtests.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kvm-xfstests/test-appliance/files/root/runtests.sh b/kvm-xfstests/test-appliance/files/root/runtests.sh
index 6cbda62..bfc5b24 100755
--- a/kvm-xfstests/test-appliance/files/root/runtests.sh
+++ b/kvm-xfstests/test-appliance/files/root/runtests.sh
@@ -288,6 +288,12 @@ do
 		export LOGWRITES_DEV=$LG_SCR_DEV
 	    fi
 	fi
+
+	# This is required in case of BTRFS uses SCRATCH_DEV_POOL
+	if [[ -n $SCRATCH_DEV_POOL ]]; then
+		unset SCRATCH_DEV
+	fi
+
 	case "$TEST_DEV" in
 	    */ovl|9p*) ;;
 	    *:/*) ;;
-- 
2.31.1