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.

diff --git a/debian/changelog b/debian/changelog
index 223cfb96093b71afa63a7cb10bb07496bf63d3ad..ed694cd7605db1889472e27183d69c40f2309fa7 100644 (file)
--- 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 <rra@debian.org>  Fri, 27 Mar 2009 07:48:11 -0700
 

diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c
index 8ddbff9824c3535e6ba89efa975529d42790e19c..446db5c493e658df8c60b2f2888dd1dfecf58012 100644 (file)
--- a/src/ubik/recovery.c
+++ b/src/ubik/recovery.c
@@ -11,7 +11,7 @@
 #include <afs/param.h>
 
 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 <sys/types.h>
 #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 99a7d17a0e768d2c2a53a03167a4de8ca445016c..2fc2f130a56df1cad39082d78fdc0ad9eb0764b2 100644 (file)
--- a/src/ubik/remote.c
+++ b/src/ubik/remote.c
@@ -11,7 +11,7 @@
 #include <afs/param.h>
 
 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 <sys/types.h>
 #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);