From: Kevin Coffman <kwc@citi.umich.edu>
Date: Fri, 3 Apr 2009 19:20:09 +0000 (-0400)
Subject: cacheio: return any original error from qword_eol
X-Git-Tag: nfs-utils-1-1-6-rc4
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=70561910500556c8109ca2e5683a92ed51c82bb7

cacheio: return any original error from qword_eol

If the initial fflush() fails in qword_eol, log the failure
and return the indication of the original failure, not the
successful cover-up.

Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Steve Dickson <steved@redhat.com>
---

diff --git a/support/nfs/cacheio.c b/support/nfs/cacheio.c
index f303734..6a6ed5a 100644
--- a/support/nfs/cacheio.c
+++ b/support/nfs/cacheio.c
@@ -154,15 +154,21 @@ int qword_eol(FILE *f)
 
 	fprintf(f,"\n");
 	err = fflush(f);
+	if (err) {
+		xlog_warn("qword_eol: fflush failed: errno %d (%s)",
+			    errno, strerror(errno));
+	}
 	/*
 	 * We must send one line (and one line only) in a single write
 	 * call.  In case of a write error, libc may accumulate the
 	 * unwritten data and try to write it again later, resulting in a
 	 * multi-line write.  So we must explicitly ask it to throw away
-	 * any such cached data:
+	 * any such cached data.  But we return any original error
+	 * indication to the caller.
 	 */
 	__fpurge(f);
-	return fflush(f);
+	fflush(f);
+	return err;
 }