DEVEL15-copyonwrite-dont-assert-20060925

take it offline, don't assert.

(cherry picked from commit c1d3a69976d7a6583a00176ff81dd66acb2cc07b)

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index a060b295ecdc773b7cdffa0fd301aaee2a06aeeb..333985354f91f6974bd9fe36244de8a13d18f184 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -1175,12 +1175,10 @@ CopyOnWrite(Vnode * targetptr, Volume * volptr)
                        ("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));
-#ifdef FAST_RESTART            /* if running in no-salvage, don't core the server */
-               ViceLog(0, ("CopyOnWrite failed: taking volume offline\n"));
-#elif defined(AFS_DEMAND_ATTACH_FS)
+#if defined(AFS_DEMAND_ATTACH_FS)
                ViceLog(0, ("CopyOnWrite failed: requesting salvage\n"));
-#else /* Avoid further corruption and try to get a core. */
-               assert(0);
+#else
+               ViceLog(0, ("CopyOnWrite failed: taking volume offline\n"));
 #endif
                /* Decrement this inode so salvager doesn't find it. */
                FDH_REALLYCLOSE(newFdP);