From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 17 Jan 2013 22:35:09 +0000 (-0600)
Subject: ubik: Remove bare global ubik_epochTime
X-Git-Tag: openafs-stable-1_8_0pre1~1662
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=a911185b314b111c13aaf5230669f69864582897;hp=7858cfd4f5b8ca4d028043bde00b02849ffa2990

ubik: Remove bare global ubik_epochTime

Commit e4ac552a moved ubik_epochTime into a global version_globals
struct. However, it missed a references to the existing
ubik_epochTime value it was moving, as well as its declaration. Remove
the declaration, and move the reference to use the version_globals
structure.

Change-Id: I2552ba850f286b2b93f3c1b696d993a7cfc074c8
Reviewed-on: http://gerrit.openafs.org/8918
Reviewed-by: Marc Dionne <marc.c.dionne@gmail.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
---

diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c
index ecb7a1a..bc3dedd 100644
--- a/src/ubik/ubik.c
+++ b/src/ubik/ubik.c
@@ -78,7 +78,6 @@ afs_int32 ubik_quorum = 0;
 struct ubik_dbase *ubik_dbase = 0;
 struct ubik_stats ubik_stats;
 afs_uint32 ubik_host[UBIK_MAX_INTERFACE_ADDR];
-afs_int32 ubik_epochTime = 0;
 afs_int32 urecovery_state = 0;
 int (*ubik_SyncWriterCacheProc) (void);
 struct ubik_server *ubik_servers;
@@ -661,7 +660,7 @@ BeginTrans(struct ubik_dbase *dbase, afs_int32 transMode,
 	}
     }
     /* label trans and dbase with new tid */
-    tt->tid.epoch = ubik_epochTime;
+    tt->tid.epoch = version_globals.ubik_epochTime;
     /* bump by two, since tidCounter+1 means trans id'd by tidCounter has finished */
     tt->tid.counter = (dbase->tidCounter += 2);