From: Andrew Deason <adeason@sinenomine.net>
Date: Mon, 6 Dec 2010 22:11:24 +0000 (-0600)
Subject: vol_split: Recover from stream open failure
X-Git-Tag: upstream/1.6.0.pre2^2~112
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=bc0c13a84ba37958c0146903b9449dc426805465;p=packages%2Fo%2Fopenafs.git

vol_split: Recover from stream open failure

Make sure we go through the error recovery code when we can't create a
stream, instead of just returning without cleaning up.

Reviewed-on: http://gerrit.openafs.org/3466
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 94591a635bdd23ba74298c64273d4688405aa370)

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

diff --git a/src/volser/vol_split.c b/src/volser/vol_split.c
index 119549dc2..73fdeab18 100644
--- a/src/volser/vol_split.c
+++ b/src/volser/vol_split.c
@@ -120,7 +120,7 @@ ExtractVnodes(struct Msg *m, Volume *vol, afs_int32 class,
 	sprintf(m->line, "Couldn't stream open %s Index of volume %u\n",
 		class ? "small":"large", V_id(vol));
 	rx_Write(m->call, m->line, strlen(m->line));
-	return EIO;
+	code = EIO;
 	goto Bad_Extract;
     }
     code = STREAM_SEEK(stream, vcp->diskSize, 0);