vos: vos release -force-reclone option

[openafs.git] / src / volser / volser.p.h

diff --git a/src/volser/volser.p.h b/src/volser/volser.p.h
index eb974b7..899c824 100644 (file)
--- a/src/volser/volser.p.h
+++ b/src/volser/volser.p.h
@@ -11,7 +11,6 @@
 #define _VOLSER_ 1
 
 #ifdef AFS_PTHREAD_ENV
-#include <assert.h>
 #include <pthread.h>
 #endif
 
@@ -36,6 +35,7 @@
 #define volser_RW      0
 #define volser_RO      1
 #define        volser_BACK     2
+#define        volser_RWREPL   3
 
 #define        THOLD(tt)       ((tt)->refCount++)
 
@@ -46,7 +46,7 @@ struct volser_trans {
     afs_int32 creationTime;    /* time the transaction started */
     afs_int32 returnCode;      /* transaction error code */
     struct Volume *volume;     /* pointer to open volume */
-    afs_uint32 volid;          /* open volume's id */
+    VolumeId volid;            /* open volume's id */
     afs_int32 partition;       /* open volume's partition */
     afs_int32 dumpTransId;     /* other side's trans id during a dump */
     afs_int32 dumpSeq;         /* next sequence number to use during a dump */
@@ -71,13 +71,13 @@ struct volser_trans {
 
 #ifdef AFS_PTHREAD_ENV
 #define VTRANS_OBJ_LOCK_INIT(tt) \
-  assert(pthread_mutex_init(&((tt)->lock),NULL) == 0)
+  opr_mutex_init(&((tt)->lock));
 #define VTRANS_OBJ_LOCK_DESTROY(tt) \
-  assert(pthread_mutex_destroy(&((tt)->lock)) == 0)
+  opr_mutex_destroy(&((tt)->lock))
 #define VTRANS_OBJ_LOCK(tt) \
-  assert(pthread_mutex_lock(&((tt)->lock)) == 0)
+  opr_mutex_enter(&((tt)->lock))
 #define VTRANS_OBJ_UNLOCK(tt) \
-  assert(pthread_mutex_unlock(&((tt)->lock)) == 0)
+  opr_mutex_exit(&((tt)->lock))
 #else
 #define VTRANS_OBJ_LOCK_INIT(tt)
 #define VTRANS_OBJ_LOCK_DESTROY(tt)
@@ -118,8 +118,6 @@ extern struct volser_trans *QI_GlobalWriteTrans;
 #define VMOVED         111     /* Volume has moved to another server; do a VGetVolumeInfo
                                 * to THIS server to find out where */
 
-#define MyPort 5003
-#define NameLen 80
 #define VLDB_MAXSERVERS 10
 #define VOLSERVICE_ID 4
 #define INVALID_BID 0
@@ -155,6 +153,7 @@ struct partList {           /*used by the backup system */
 #define ITSROVOL    0x02
 #define ITSRWVOL    0x04
 #define ITSBACKVOL  0x08
+#define ITSRWREPL   0x10
 #define RO_DONTUSE  0x20
 
 #define VLOP_RESTORE 0x100     /*this is bogus, clashes with VLOP_DUMP */
@@ -184,14 +183,19 @@ struct partList {         /*used by the backup system */
 #define RV_NOVLDB      0x040000
 #define RV_NOCLONE     0x080000
 #define RV_NODEL        0x100000
+#define RV_RWONLY      0x200000
+
+/* Values for the UV_ReleaseVolume flags parameters */
+#define REL_COMPLETE    0x000001  /* force a complete release */
+#define REL_FULLDUMPS   0x000002  /* force full dumps */
+#define REL_STAYUP      0x000004  /* dump to clones to avoid offline time */
 
 struct ubik_client;
 extern afs_uint32 vsu_GetVolumeID(char *astring, struct ubik_client *acstruct, afs_int32 *errp);
 extern int vsu_ExtractName(char rname[], char name[]);
-extern afs_int32 vsu_ClientInit(int noAuthFlag, const char *confDir,
-                               char *cellName, afs_int32 sauth,
-                               struct ubik_client **uclientp,
-                               int (*secproc)(struct rx_securityClass *, afs_int32));
-extern void vsu_SetCrypt(int cryptflag);
-
+extern afs_int32 vsu_ClientInit(const char *confDir, char *cellName,
+                               int secFlags,
+                               int (*secproc)(struct rx_securityClass *,
+                                              afs_int32),
+                               struct ubik_client **uclientp);
 #endif /* _VOLSER_ */