From: Nathan Neulinger <nneul@umr.edu>
Date: Thu, 14 Nov 2002 20:18:07 +0000 (+0000)
Subject: as edited by shadow@dementia.org
X-Git-Tag: openafs-stable-1_2_8~57
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=84cd2cfe0560027ae194bce9c64970bc8eda9bd7;p=packages%2Fo%2Fopenafs.git

as edited by shadow@dementia.org


(cherry picked from commit 729ec68bf6c2d51d8738524149dba613fce9094f)
---

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index fe2721248..df4d7faf5 100644
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -6606,7 +6606,11 @@ int CopyOnWrite(targetptr, volptr)
 		    ViceLog(0,("CopyOnWrite failed: volume %u in partition %s  (tried reading %u, read %u, wrote %u, errno %u) volume needs salvage\n",
 			       V_id(volptr), volptr->partition->name, length,
 			       rdlen, wrlen, errno));
-		    assert(0);
+#ifdef FAST_RESTART /* if running in no-salvage, don't core the server */
+		    ViceLog(0,("CopyOnWrite failed: taking volume offline\n"));
+#else /* Avoid further corruption and try to get a core. */
+		    assert(0); 
+#endif
                     /* Decrement this inode so salvager doesn't find it. */
 		    FDH_REALLYCLOSE(newFdP);
 		    IH_RELEASE(newH);