]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
volser: set error, not code, before rfail
authorBenjamin Kaduk <kaduk@mit.edu>
Sun, 22 Nov 2015 19:24:43 +0000 (13:24 -0600)
committerStephan Wiesand <stephan.wiesand@desy.de>
Wed, 30 Mar 2016 14:20:41 +0000 (10:20 -0400)
The rfail cleanup handler overwrites 'code' ~unconditionally, but
does use an existing 'error' value if present.  Since the intent
is to return failure to the caller, preserve the code in the error
variable and do so.

FIXES 131897

Reviewed-on: http://gerrit.openafs.org/12108
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit 888fc16db5f0063464bf219a6cf6fee0faea4705)

Change-Id: Ic8aab7cbe9bac6c0677b1e3bc2ca2b59a76bd621
Reviewed-on: https://gerrit.openafs.org/12126
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
src/volser/vsprocs.c

index 6ef13d79f04134047da7c1a50f879966b5c2644a..c8f68daa891e2f7a84d38716b17844a067df1560 100644 (file)
@@ -3954,7 +3954,7 @@ UV_ReleaseVolume(afs_uint32 afromvol, afs_uint32 afromserver,
 
        code = CheckTrans(fromconn, &fromtid, afrompart, &orig_status);
        if (code) {
-           code = ENOENT;
+           error = ENOENT;
            goto rfail;
        }