Move VLOP_RESTORE and VLOP_ADDSITE home

Change-Id: I19c04ea1762eec349b0e9645fa9777e6a6c5263a
Reviewed-on: http://gerrit.openafs.org/11325
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>

diff --git a/src/vlserver/vldbint.xg b/src/vlserver/vldbint.xg
index 8e1378fc6a02f7f2e8a790036497607a23bdc9d6..ff34d12d45454de328439cab3ed896fd564f0c59 100644 (file)
--- a/src/vlserver/vldbint.xg
+++ b/src/vlserver/vldbint.xg
@@ -182,6 +182,14 @@ const VLOP_BACKUP      = 0x40;
 const VLOP_DELETE      = 0x80;
 const VLOP_DUMP        = 0x100;
 
+/*
+ * Additional VLOP_xxxx constants cannot be added without breaking
+ * compatibility so must reuse values. New names are added for
+ * code readability.
+ */
+%#define VLOP_ADDSITE   VLOP_DELETE
+%#define VLOP_RESTORE   VLOP_DUMP
+
 %#define VLOP_ALLOPERS ( VLOP_MOVE | VLOP_RELEASE | VLOP_BACKUP | VLOP_DELETE | VLOP_DUMP)
 
 /* defines for convenience of vl users */

diff --git a/src/volser/volser.p.h b/src/volser/volser.p.h
index 899c824f036ec83b229ace1359907f0a2c780cbd..afe391f4be0386e7e6c0d86a6389734975c61423 100644 (file)
--- a/src/volser/volser.p.h
+++ b/src/volser/volser.p.h
@@ -156,8 +156,6 @@ struct partList {           /*used by the backup system */
 #define ITSRWREPL   0x10
 #define RO_DONTUSE  0x20
 
-#define VLOP_RESTORE 0x100     /*this is bogus, clashes with VLOP_DUMP */
-#define VLOP_ADDSITE 0x80      /*this is bogus, clashes with VLOP_DELETE */
 #define PARTVALID 0x01
 #define CLONEVALID 0x02
 #define CLONEZAPPED 0x04