Give a default reason in *sync-debug

If no -reason is given for fssync-debug calls, we currently just
transmit garbage to the fileserver or salvageserver. Instead, give a
default (the *_WHATEVER constant), so we do something consistent.

Reviewed-on: http://gerrit.openafs.org/4115
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 7f31a11d110085ae528d4555d34744c0832008b0)

Change-Id: I27aefea0e891444e006e5d4b5ed43ed9cd492242
Reviewed-on: http://gerrit.openafs.org/5756
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>

diff --git a/src/tsalvaged/salvsync-debug.c b/src/tsalvaged/salvsync-debug.c
index b7bea96fd19cd6f11e2a76b64e2e805082434861..24379f25a34daab87e0d9bb782f272d2f8d3f4c8 100644 (file)
--- a/src/tsalvaged/salvsync-debug.c
+++ b/src/tsalvaged/salvsync-debug.c
@@ -197,7 +197,10 @@ common_prolog(struct cmd_syndesc * as, struct state * state)
 
     if ((ti = as->parms[COMMON_PARMS_OFFSET].items)) { /* -reason */
        state->reason = atoi(ti->data);
+    } else {
+       state->reason = SALVSYNC_REASON_WHATEVER;
     }
+
     if ((ti = as->parms[COMMON_PARMS_OFFSET+1].items)) {       /* -programtype */
        if (!strcmp(ti->data, "fileServer")) {
            programType = fileServer;

diff --git a/src/vol/fssync-debug.c b/src/vol/fssync-debug.c
index 95f5818a99e2e86a80b6f5921200f604d3c4ec56..61cd76cb6cd689a5dbb317e462d5b1b5ee53e8af 100644 (file)
--- a/src/vol/fssync-debug.c
+++ b/src/vol/fssync-debug.c
@@ -332,7 +332,10 @@ common_prolog(struct cmd_syndesc * as, struct state * state)
 
     if ((ti = as->parms[COMMON_PARMS_OFFSET].items)) { /* -reason */
        state->reason = atoi(ti->data);
+    } else {
+       state->reason = FSYNC_WHATEVER;
     }
+
     if ((ti = as->parms[COMMON_PARMS_OFFSET+1].items)) {       /* -programtype */
        if (!strcmp(ti->data, "fileServer")) {
            programType = fileServer;
@@ -1496,8 +1499,6 @@ VGCDel(struct cmd_syndesc * as, void * rock)
     }
     child = atoi(ti->data);
 
-    state.reason = FSYNC_WHATEVER;
-
     common_prolog(as, &state);
     fprintf(stderr, "calling FSYNC_VCGDel\n");
     code = FSYNC_VGCDel(partName, parent, child, state.reason, &res);