From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 30 Jan 2014 20:43:57 +0000 (-0600)
Subject: afs: Pay attention to fetchOps->destroy error code
X-Git-Tag: upstream/1.8.0_pre1^2~803
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b39833048124030bc15526d116b504fd43e100bb;p=packages%2Fo%2Fopenafs.git

afs: Pay attention to fetchOps->destroy error code

The ->destroy function in our fetchops could change our error code, or
even raise a new error. Don't ignore it. This currently doesn't do
much, since fetchDestroy currently won't change the error code if it's
given an error, but this can change in the future.

Change-Id: I6fa98cc709cb0fbd4c1e868ba4b9be53313573ff
Reviewed-on: http://gerrit.openafs.org/10787
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
---

diff --git a/src/afs/afs_fetchstore.c b/src/afs/afs_fetchstore.c
index 8db669771..a9f47a0c8 100644
--- a/src/afs/afs_fetchstore.c
+++ b/src/afs/afs_fetchstore.c
@@ -1169,7 +1169,7 @@ afs_CacheFetchProc(struct afs_conn *tc, struct rx_connection *rxconn,
     if (!code)
 	code = (*ops->close)(rock, avc, adc, tsmall);
     if (ops)
-	(*ops->destroy)(&rock, code);
+	code = (*ops->destroy)(&rock, code);
 
 #ifndef AFS_NOSTATS
     FillStoreStats(code, AFS_STATS_FS_XFERIDX_FETCHDATA, xferStartTime,