From: Mark Vitale Date: Fri, 4 May 2018 19:42:14 +0000 (-0400) Subject: ubik: make ContactQuorum_* routines static X-Git-Tag: openafs-devel-1_9_0~538 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=27d7b8fe4603c39362983758fe6a749fa5ffa4e5;hp=8b1e730c11a6ed7dc067ef185302bd57a69f6d1e ubik: make ContactQuorum_* routines static Most of the ContactQuorum_* routines are only used in ubik.c, so make them all static - except for ContactQuorum_DISK_SetVersion, which is called from disk.c. Change-Id: I7d1ccd839e01ea8ee8d768dd369a892773361b05 Reviewed-on: https://gerrit.openafs.org/13078 Tested-by: BuildBot Reviewed-by: Andrew Deason Reviewed-by: Benjamin Kaduk --- diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c index 2345fa3..30beacf 100644 --- a/src/ubik/ubik.c +++ b/src/ubik/ubik.c @@ -223,7 +223,7 @@ ContactQuorum_rcode(int okcalls, afs_int32 rcode) * because it is sent the sync count along with the beacon message that * marks it as \b really up (\p beaconSinceDown). */ -afs_int32 +static afs_int32 ContactQuorum_NoArguments(afs_int32 (*proc)(struct rx_connection *, ubik_tid *), struct ubik_trans *atrans, int aflags) { @@ -242,7 +242,7 @@ ContactQuorum_NoArguments(afs_int32 (*proc)(struct rx_connection *, ubik_tid *), } -afs_int32 +static afs_int32 ContactQuorum_DISK_Lock(struct ubik_trans *atrans, int aflags,afs_int32 file, afs_int32 position, afs_int32 length, afs_int32 type) { @@ -260,7 +260,7 @@ ContactQuorum_DISK_Lock(struct ubik_trans *atrans, int aflags,afs_int32 file, return ContactQuorum_rcode(okcalls, rcode); } -afs_int32 +static afs_int32 ContactQuorum_DISK_Truncate(struct ubik_trans *atrans, int aflags, afs_int32 file, afs_int32 length) { @@ -279,7 +279,7 @@ ContactQuorum_DISK_Truncate(struct ubik_trans *atrans, int aflags, } -afs_int32 +static afs_int32 ContactQuorum_DISK_WriteV(struct ubik_trans *atrans, int aflags, iovec_wrt * io_vector, iovec_buf *io_buffer) { diff --git a/src/ubik/ubik.p.h b/src/ubik/ubik.p.h index 06f5321..d703ce0 100644 --- a/src/ubik/ubik.p.h +++ b/src/ubik/ubik.p.h @@ -462,26 +462,6 @@ extern int DoProbe(struct ubik_server *server); /*\}*/ /*! \name ubik.c */ -extern afs_int32 ContactQuorum_NoArguments(afs_int32 (*proc) - (struct rx_connection *, - ubik_tid *), - struct ubik_trans *atrans, - int aflags); - -extern afs_int32 ContactQuorum_DISK_Lock(struct ubik_trans *atrans, - int aflags, - afs_int32 file, afs_int32 position, - afs_int32 length, afs_int32 type); - -extern afs_int32 ContactQuorum_DISK_Truncate(struct ubik_trans *atrans, - int aflags, - afs_int32 file, afs_int32 length); - -extern afs_int32 ContactQuorum_DISK_WriteV(struct ubik_trans *atrans, - int aflags, - iovec_wrt * io_vector, - iovec_buf *io_buffer); - extern afs_int32 ContactQuorum_DISK_SetVersion(struct ubik_trans *atrans, int aflags, ubik_version *OldVersion,