From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 14 Dec 2019 04:23:06 +0000 (-0500)
Subject: e2scrub: fix the 30 second timeout when trying to remove a snapshot
X-Git-Tag: v1.45.5~30
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=1f0f27059a50d38cec69c7120b9f7a3045838792;p=tools%2Fe2fsprogs.git

e2scrub: fix the 30 second timeout when trying to remove a snapshot

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/scrub/e2scrub.in b/scrub/e2scrub.in
index b778a92..f21499b 100644
--- a/scrub/e2scrub.in
+++ b/scrub/e2scrub.in
@@ -201,7 +201,7 @@ mark_corrupt() {
 
 setup() {
 	# Try to remove snapshot for 30s, bail out if we can't remove it.
-	lveremove_deadline="$(( $(date "+%s") + 30))"
+	lvremove_deadline="$(( $(date "+%s") + 30))"
 	${DBG} lvremove -f "${LVM2_VG_NAME}/${snap}" 2>/dev/null
 	while [ -e "${snap_dev}" ] && [ "$?" -eq "5" ] &&
 	      [ "$(date "+%s")" -lt "${lvremove_deadline}" ]; do