From: Andrew Deason <adeason@sinenomine.net>
Date: Wed, 23 Mar 2011 20:19:03 +0000 (-0500)
Subject: namei: Log ListViceInodes write failures
X-Git-Tag: upstream/1.8.0_pre1^2~4013
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=22149d82d465f5defbe329b3f9b3c5040a6293e9;p=packages%2Fo%2Fopenafs.git

namei: Log ListViceInodes write failures

If we fail to write to the inodeFile given by ListViceInodes, we
should log the failure. Otherwise, no indication is given as to what
failed, when a salvage gathers the inode list.

Change-Id: Ia54105e1043969781711b9168c6787d07d1d319f
Reviewed-on: http://gerrit.openafs.org/4294
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c
index 5601980f7..82c4aadaa 100644
--- a/src/vol/namei_ops.c
+++ b/src/vol/namei_ops.c
@@ -1870,9 +1870,12 @@ _namei_examine_special(char * path1,
 
     if (!judgeFun ||
 	(*judgeFun) (&info, singleVolumeNumber, rock)) {
-	ret = 1;
-        if ((*writeFun) (fp, &info, path1, dname) < 0) {
+	ret = (*writeFun) (fp, &info, path1, dname);
+	if (ret < 0) {
+	    Log("_namei_examine_special: writeFun returned %d\n", ret);
 	    ret = -1;
+	} else {
+	    ret = 1;
 	}
     }
 
@@ -1952,9 +1955,12 @@ _namei_examine_reg(char * path3,
 
     if (!judgeFun ||
 	(*judgeFun) (&info, singleVolumeNumber, rock)) {
-	ret = 1;
-        if ((*writeFun) (fp, &info, path3, dname) < 0) {
+	ret = (*writeFun) (fp, &info, path3, dname);
+	if (ret < 0) {
+	    Log("_namei_examine_reg: writeFun returned %d\n", ret);
 	    ret = -1;
+	} else {
+	    ret = 1;
 	}
     }