From 2ec8b361af452b4a0e23735a0d7cf1f1210c22b5 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Fri, 27 Mar 2009 07:59:25 -0700 Subject: [PATCH] Apply upstream delta to fix Ubik synchronization * Apply upstream CVS deltas: - STABLE14-uphys-invalidate-returns-void-20081130: fix apparent Ubik synchronization errors due to incorrect use of a void return value. --- debian/changelog | 2 ++ src/ubik/recovery.c | 16 ++++++++-------- src/ubik/remote.c | 10 +++++----- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 223cfb960..ed694cd76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ openafs (1.4.8.dfsg1-3) unstable; urgency=low way they were allocated. - STABLE14-shutdown-vcache-avoid-null-deref-20090324: avoid oops on shutdown. (LP: #333197) + - STABLE14-uphys-invalidate-returns-void-20081130: fix apparent Ubik + synchronization errors due to incorrect use of a void return value. -- Russ Allbery Fri, 27 Mar 2009 07:48:11 -0700 diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c index 8ddbff982..446db5c49 100644 --- a/src/ubik/recovery.c +++ b/src/ubik/recovery.c @@ -11,7 +11,7 @@ #include RCSID - ("$Header: /cvs/openafs/src/ubik/recovery.c,v 1.13.2.7 2008/10/18 15:24:57 jaltman Exp $"); + ("$Header: /cvs/openafs/src/ubik/recovery.c,v 1.13.2.8 2008/11/30 19:49:41 shadow Exp $"); #include #ifdef AFS_NT40_ENV @@ -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 99a7d17a0..2fc2f130a 100644 --- a/src/ubik/remote.c +++ b/src/ubik/remote.c @@ -11,7 +11,7 @@ #include RCSID - ("$Header: /cvs/openafs/src/ubik/remote.c,v 1.12.2.9 2008/10/27 23:54:10 shadow Exp $"); + ("$Header: /cvs/openafs/src/ubik/remote.c,v 1.12.2.10 2008/11/30 19:49:41 shadow Exp $"); #include #ifdef AFS_NT40_ENV @@ -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