ubik recovery and remote use correct file number

the file propagation "out of band" changes should not hardcode recovery
on file 0, but instead work on any file the interface is acting on.
use the provided file number.

Reviewed-on: http://gerrit.openafs.org/2715
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit f8ff458ef02d5ef49bc467304e40571d871385c8)
Change-Id: I2cf324c9759f9878c5b37603480a9c803c041641
Reviewed-on: http://gerrit.openafs.org/2717

diff --git a/src/ubik/recovery.c b/src/ubik/recovery.c
index 5992a9a04e1287aaf4fed21878baf82e5c474eb5..23d4d145a9f4f26b780effd0786e6be0154e1f6a 100644 (file)
--- a/src/ubik/recovery.c
+++ b/src/ubik/recovery.c
@@ -684,7 +684,7 @@ urecovery_Interact(void *dummy)
                if (!code)
                    code = rename(pbuffer, tbuffer);
                if (!code) {
-                   (*ubik_dbase->open) (ubik_dbase, 0);
+                   (*ubik_dbase->open) (ubik_dbase, file);
 #endif
                    /* after data is good, sync disk with correct label */
                    code =

diff --git a/src/ubik/remote.c b/src/ubik/remote.c
index 3654b7742241897a406474f746762d9c4833c1e9..e78b7b37d27c85b2ce615f5c8e6daf2a33eec7ff 100644 (file)
--- a/src/ubik/remote.c
+++ b/src/ubik/remote.c
@@ -598,7 +598,7 @@ SDISK_SendFile(struct rx_call *rxcall, afs_int32 file,
     if (!code)
        code = rename(pbuffer, tbuffer);
     if (!code) {
-       (*ubik_dbase->open) (ubik_dbase, 0);
+       (*ubik_dbase->open) (ubik_dbase, file);
 #endif
        code = (*ubik_dbase->setlabel) (dbase, file, avers);
 #ifndef OLD_URECOVERY