From 2c98e2a6bb616841825437c5306ee24b6198f09d Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Sun, 30 Nov 2008 19:49:41 +0000 Subject: [PATCH] STABLE14-uphys-invalidate-returns-void-20081130 LICENSE IPL10 FIXES 123723 thanks to Hartmut Reuter for catching this. (cherry picked from commit 96996e65fcd569565e78b7af79258dfad3b0d261) --- src/ubik/recovery.c | 14 +++++++------- src/ubik/remote.c | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c index 7aa4242a4..301546e77 100644 --- a/src/ubik/recovery.c +++ b/src/ubik/recovery.c @@ -649,15 +649,15 @@ urecovery_Interact(void *dummy) #endif if (!code) code = rename(pbuffer, tbuffer); - if (!code) - code = (*ubik_dbase->open) (ubik_dbase, 0); - if (!code) + if (!code) { + (*ubik_dbase->open) (ubik_dbase, 0); #endif - /* after data is good, sync disk with correct label */ - code = - (*ubik_dbase->setlabel) (ubik_dbase, 0, - &ubik_dbase->version); + /* after data is good, sync disk with correct label */ + code = + (*ubik_dbase->setlabel) (ubik_dbase, 0, + &ubik_dbase->version); #ifndef OLD_URECOVERY + } #ifdef AFS_NT40_ENV afs_snprintf(pbuffer, sizeof(pbuffer), "%s.DB0.OLD", ubik_dbase->pathName); unlink(pbuffer); diff --git a/src/ubik/remote.c b/src/ubik/remote.c index 395ea5892..1ec8b7bb6 100644 --- a/src/ubik/remote.c +++ b/src/ubik/remote.c @@ -615,12 +615,12 @@ SDISK_SendFile(rxcall, file, length, avers) #endif if (!code) code = rename(pbuffer, tbuffer); - if (!code) - code = (*ubik_dbase->open) (ubik_dbase, 0); - if (!code) + if (!code) { + (*ubik_dbase->open) (ubik_dbase, 0); #endif - code = (*ubik_dbase->setlabel) (dbase, file, avers); + code = (*ubik_dbase->setlabel) (dbase, file, avers); #ifndef OLD_URECOVERY + } #ifdef AFS_NT40_ENV afs_snprintf(pbuffer, sizeof(pbuffer), "%s.DB0.OLD", ubik_dbase->pathName); unlink(pbuffer); -- 2.39.5