From 185699e631ec3548bb6d1e68302d4a652632d3e6 Mon Sep 17 00:00:00 2001 From: Christof Hanke Date: Wed, 22 Aug 2012 16:39:13 +0200 Subject: [PATCH] fileserver: add volume number to error-messages in physio. If things go wrong in ReallyRead() or ReallyWrite(), the admin would like to know which volume to salvage. Change-Id: Ic822412fec56ac5bb68f04d80713d94cbf977e71 Reviewed-on: http://gerrit.openafs.org/8010 Reviewed-by: Andrew Deason Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/viced/physio.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/viced/physio.c b/src/viced/physio.c index eb236ec..d091865 100644 --- a/src/viced/physio.c +++ b/src/viced/physio.c @@ -51,10 +51,10 @@ ReallyRead(DirHandle * file, int block, char *data) if (fdP == NULL) { code = errno; ViceLog(0, - ("ReallyRead(): open failed device %X inode %s errno %d\n", + ("ReallyRead(): open failed device %X inode %s (volume=%u) errno %d\n", file->dirh_handle->ih_dev, PrintInode(stmp, file->dirh_handle-> - ih_ino), code)); + ih_ino), file->dirh_handle->ih_vid,code)); return code; } rdlen = FDH_PREAD(fdP, data, PAGESIZE, ((afs_foff_t)block) * PAGESIZE); @@ -64,10 +64,10 @@ ReallyRead(DirHandle * file, int block, char *data) else code = EIO; ViceLog(0, - ("ReallyRead(): read failed device %X inode %s errno %d\n", + ("ReallyRead(): read failed device %X inode %s (volume=%u) errno %d\n", file->dirh_handle->ih_dev, PrintInode(stmp, file->dirh_handle-> - ih_ino), code)); + ih_ino), file->dirh_handle->ih_vid,code)); FDH_REALLYCLOSE(fdP); return code; } @@ -87,19 +87,19 @@ ReallyWrite(DirHandle * file, int block, char *data) fdP = IH_OPEN(file->dirh_handle); if (fdP == NULL) { ViceLog(0, - ("ReallyWrite(): open failed device %X inode %s errno %d\n", + ("ReallyWrite(): open failed device %X inode %s (volume=%u) errno %d\n", file->dirh_handle->ih_dev, PrintInode(stmp, file->dirh_handle-> - ih_ino), errno)); + ih_ino), file->dirh_handle->ih_vid,errno)); lpErrno = errno; return 0; } if ((count = FDH_PWRITE(fdP, data, PAGESIZE, ((afs_foff_t)block) * PAGESIZE)) != PAGESIZE) { ViceLog(0, - ("ReallyWrite(): write failed device %X inode %s errno %d\n", + ("ReallyWrite(): write failed device %X inode %s (volume=%u) errno %d\n", file->dirh_handle->ih_dev, PrintInode(stmp, file->dirh_handle-> - ih_ino), errno)); + ih_ino), file->dirh_handle->ih_vid,errno)); lpCount = count; lpErrno = errno; FDH_REALLYCLOSE(fdP); -- 1.9.4