X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fubik%2Frecovery.c;h=b6195c359a35fb804e721828bb77cc3f929679dc;hp=cfa6e4ab26547350a45418d9a0c17986f97b136c;hb=759487038bbaccf59e49f973b627ee20f555e7b3;hpb=bafa4d17530338122581d5b11eba367ebd445c30

diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c
index cfa6e4a..b6195c3 100644
--- a/src/ubik/recovery.c
+++ b/src/ubik/recovery.c
@@ -156,13 +156,13 @@ urecovery_AbortAll(struct ubik_dbase *adbase)
  * \brief this routine aborts the current remote transaction, if any, if the tid is wrong
  */
 int
-urecovery_CheckTid(struct ubik_tid *atid)
+urecovery_CheckTid(struct ubik_tid *atid, int abortalways)
 {
     if (ubik_currentTrans) {
 	/* there is remote write trans, see if we match, see if this
 	 * is a new transaction */
 	if (atid->epoch != ubik_currentTrans->tid.epoch
-	    || atid->counter > ubik_currentTrans->tid.counter) {
+	    || atid->counter > ubik_currentTrans->tid.counter || abortalways) {
 	    /* don't match, abort it */
 	    /* If the thread is not waiting for lock - ok to end it */
 #if !defined(UBIK_PAUSE)