From: Nathan Neulinger <nneul@umr.edu>
Date: Fri, 19 Apr 2002 05:15:03 +0000 (+0000)
Subject: based on feedback from ota@transarc.com
X-Git-Tag: openafs-stable-1_2_4~69
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ac52ae9fae1bffab7bd24dba2b0bd5c78c7da173;p=packages%2Fo%2Fopenafs.git

based on feedback from ota@transarc.com

PrintInode returns a string, use it


(cherry picked from commit 9a6dbb4df705e063a6ab093b29e7619321aeb565)
---

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index 7aec8c706..ed9b7299f 100644
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -2293,7 +2293,7 @@ SAFSS_Rename (tcon, OldDirFid, OldName, NewDirFid, NewName, OutOldDirStatus,
 				 V_parentId(volptr));
 		IH_RELEASE(newfileptr->handle);
 		if (errorCode == -1) {
-		    ViceLog(0, ("Del: inode=%d, name=%s, errno=%d\n",
+		    ViceLog(0, ("Del: inode=%s, name=%s, errno=%d\n",
 				PrintInode(NULL, VN_GET_INO(newfileptr)),
 				NewName, errno));
 		    if ((errno != ENOENT) && (errno != EIO) && (errno != ENXIO))
diff --git a/src/viced/physio.c b/src/viced/physio.c
index c606ee568..642cda9c8 100644
--- a/src/viced/physio.c
+++ b/src/viced/physio.c
@@ -59,7 +59,7 @@ char	      *	data;
     if (fdP == NULL) {
 	code = errno;
         ViceLog (0,
-		 ("ReallyRead(): open failed device %X inode %X errno %d\n",
+		 ("ReallyRead(): open failed device %X inode %s errno %d\n",
 		  file->dirh_handle->ih_dev,
 		  PrintInode(NULL, file->dirh_handle->ih_ino), code));
 	return code;
@@ -67,7 +67,7 @@ char	      *	data;
     if (FDH_SEEK(fdP, block * PAGESIZE, SEEK_SET) < 0) {
 	code = errno;
         ViceLog (0,
-		 ("ReallyRead(): lseek failed device %X inode %X errno %d\n",
+		 ("ReallyRead(): lseek failed device %X inode %s errno %d\n",
 		  file->dirh_handle->ih_dev,
 		  PrintInode(NULL, file->dirh_handle->ih_ino), code));
 	FDH_REALLYCLOSE(fdP);
@@ -80,7 +80,7 @@ char	      *	data;
 	else
 	    code = EIO;
         ViceLog (0,
-		 ("ReallyRead(): read failed device %X inode %X errno %d\n",
+		 ("ReallyRead(): read failed device %X inode %s errno %d\n",
 		  file->dirh_handle->ih_dev,
 		  PrintInode(NULL, file->dirh_handle->ih_ino), code));
 	FDH_REALLYCLOSE(fdP);
@@ -103,7 +103,7 @@ char	      *	data;
     fdP = IH_OPEN(file->dirh_handle);
     if (fdP == NULL) {
         ViceLog (0,
-		 ("ReallyWrite(): open failed device %X inode %X errno %d\n",
+		 ("ReallyWrite(): open failed device %X inode %s errno %d\n",
 		  file->dirh_handle->ih_dev,
 		  PrintInode(NULL, file->dirh_handle->ih_ino), errno));
 	lpErrno = errno;
@@ -111,7 +111,7 @@ char	      *	data;
     }
     if (FDH_SEEK(fdP, block * PAGESIZE, SEEK_SET) < 0) {
         ViceLog (0,
-		 ("ReallyWrite(): lseek failed device %X inode %X errno %d\n",
+		 ("ReallyWrite(): lseek failed device %X inode %s errno %d\n",
 		  file->dirh_handle->ih_dev,
 		  PrintInode(NULL, file->dirh_handle->ih_ino), errno));
 	lpErrno = errno;
@@ -120,7 +120,7 @@ char	      *	data;
     }
     if ((count = FDH_WRITE(fdP, data, PAGESIZE)) != PAGESIZE) {
         ViceLog (0,
-		 ("ReallyWrite(): write failed device %X inode %X errno %d\n",
+		 ("ReallyWrite(): write failed device %X inode %s errno %d\n",
 		  file->dirh_handle->ih_dev,
 		  PrintInode(NULL, file->dirh_handle->ih_ino), errno));
 	lpCount = count;