From 83e29ccc89a0c9a234e913b8216709bf5b541c7d Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Wed, 2 Mar 2011 13:12:25 -0600 Subject: [PATCH] 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 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit 7f31a11d110085ae528d4555d34744c0832008b0) Change-Id: I27aefea0e891444e006e5d4b5ed43ed9cd492242 Reviewed-on: http://gerrit.openafs.org/5756 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/tsalvaged/salvsync-debug.c | 3 +++ src/vol/fssync-debug.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/tsalvaged/salvsync-debug.c b/src/tsalvaged/salvsync-debug.c index b7bea96fd..24379f25a 100644 --- 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 95f5818a9..61cd76cb6 100644 --- 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); -- 2.39.5