From: Mark Vitale <mvitale@sinenomine.net>
Date: Tue, 4 Sep 2012 13:06:44 +0000 (-0400)
Subject: vos: convertROtoRW incorrect warning when RO not in VLDB
X-Git-Tag: upstream/1.8.0_pre1^2~2053
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b650106e301ecefe2f5c8f4a34081af1f5f74901;p=packages%2Fo%2Fopenafs.git

vos: convertROtoRW incorrect warning when RO not in VLDB

vos convertROtoRW will issue an incorrect warning about a partition
mismatch if the RO to convert is not in the VLDB.  Only check the
partition if the RO is in the VLDB.

Change-Id: Ib2726bc5bf6697898ad26dc1d817143da3286ba3
Reviewed-on: http://gerrit.openafs.org/8036
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/volser/vos.c b/src/volser/vos.c
index 89b5bd801..6d2c0b23a 100644
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -5584,7 +5584,7 @@ ConvertRO(struct cmd_syndesc *as, void *arock)
     if (!roserver) {
 	fprintf(STDERR, "Warning: RO volume didn't exist in vldb!\n");
     }
-    if (ropartition != partition) {
+    if (roserver && (ropartition != partition)) {
 	fprintf(STDERR,
 		"Warning: RO volume should be in partition %d instead of %d (vldb)\n",
 		ropartition, partition);