From: Love Hörnquist-Åstrand <lha@stacken.kth.se>
Date: Sat, 15 May 2004 07:11:40 +0000 (+0000)
Subject: salvager-log-instead-of-abort-20040515
X-Git-Tag: openafs-devel-1_3_65~99
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e59d92b03e187506ccae82df7cbd530ae81ce11f;p=packages%2Fo%2Fopenafs.git

salvager-log-instead-of-abort-20040515

FIXES 4533

insert of assert, log an error
---

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index 920e677a3..d1234900e 100644
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -864,7 +864,12 @@ ObtainSalvageLock(void)
 #else
     salvageLock =
 	afs_open(AFSDIR_SERVER_SLVGLOCK_FILEPATH, O_CREAT | O_RDWR, 0666);
-    assert(salvageLock >= 0);
+    if (salvageLock < 0) {
+	fprintf(stderr,
+		"salvager:  can't open salvage lock file %s, aborting\n",
+		AFSDIR_SERVER_SLVGLOCK_FILEPATH);
+	Exit(1);
+    }
 #ifdef AFS_DARWIN_ENV
     if (flock(salvageLock, LOCK_EX) == -1) {
 #else