From: Michael Meffie Date: Fri, 30 Jan 2015 16:53:58 +0000 (-0500) Subject: volser: update log formatting in dump and restore X-Git-Tag: openafs-stable-1_8_0pre1~227 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=c565450501e4bb43697fa957f55f8486f21071fa;hp=518807cae868b6547685a3b5aaf41c6f012665ac volser: update log formatting in dump and restore Update the log messages to use modern formatting specifiers for volume ids and inodes in the volume dump and restore code. Change-Id: Ic2844e389e5951d2f2bbbc31a86c2342f2e8d848 Reviewed-on: http://gerrit.openafs.org/11701 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c index 21ed803..8c01aa0 100644 --- a/src/volser/dumpstuff.c +++ b/src/volser/dumpstuff.c @@ -62,7 +62,7 @@ static int DumpVnodeIndex(struct iod *iodp, Volume * vp, VnodeClass class, afs_int32 fromtime, int forcedump); static int DumpVnode(struct iod *iodp, struct VnodeDiskObject *v, - int volid, int vnodeNumber, int dumpEverything); + VolumeId volid, int vnodeNumber, int dumpEverything); static int ReadDumpHeader(struct iod *iodp, struct DumpHeader *hp); static int ReadVnodes(struct iod *iodp, Volume * vp, int incremental, afs_foff_t * Lbuf, afs_int32 s1, afs_foff_t * Sbuf, @@ -82,7 +82,7 @@ static int SizeDumpVnodeIndex(struct iod *iodp, Volume * vp, int forcedump, struct volintSize *size); static int SizeDumpVnode(struct iod *iodp, struct VnodeDiskObject *v, - int volid, int vnodeNumber, int dumpEverything, + VolumeId volid, int vnodeNumber, int dumpEverything, struct volintSize *size); #define MAX_SECTIONS 3 @@ -1058,12 +1058,13 @@ DumpDumpHeader(struct iod *iodp, Volume * vp, } static int -DumpVnode(struct iod *iodp, struct VnodeDiskObject *v, int volid, +DumpVnode(struct iod *iodp, struct VnodeDiskObject *v, VolumeId volid, int vnodeNumber, int dumpEverything) { int code = 0; IHandle_t *ihP; FdHandle_t *fdP; + afs_ino_str_t stmp; if (!v || v->type == vNull) return code; @@ -1103,7 +1104,11 @@ DumpVnode(struct iod *iodp, struct VnodeDiskObject *v, int volid, IH_INIT(ihP, iodp->device, iodp->parentId, VNDISK_GET_INO(v)); fdP = IH_OPEN(ihP); if (fdP == NULL) { - Log("1 Volser: DumpVnode: dump: Unable to open inode %llu for vnode %u (volume %i); not dumped, error %d\n", (afs_uintmax_t) VNDISK_GET_INO(v), vnodeNumber, volid, errno); + Log("1 Volser: DumpVnode: dump: Unable to open inode %s " + "for vnode %u (volume %" AFS_VOLID_FMT "); " + "not dumped, error %d\n", + PrintInode(stmp, VNDISK_GET_INO(v)), vnodeNumber, + afs_printable_VolumeId_lu(volid), errno); IH_RELEASE(ihP); return VOLSERREAD_DUMPERROR; } @@ -1112,10 +1117,11 @@ DumpVnode(struct iod *iodp, struct VnodeDiskObject *v, int volid, if (indexlen != disklen) { FDH_REALLYCLOSE(fdP); IH_RELEASE(ihP); - Log("DumpVnode: volume %lu vnode %lu has inconsistent length " - "(index %lu disk %lu); aborting dump\n", - (unsigned long)volid, (unsigned long)vnodeNumber, - (unsigned long)indexlen, (unsigned long)disklen); + Log("DumpVnode: volume %"AFS_VOLID_FMT" " + "vnode %lu has inconsistent length " + "(index %lu disk %lu); aborting dump\n", + afs_printable_VolumeId_lu(volid), (unsigned long)vnodeNumber, + (unsigned long)indexlen, (unsigned long)disklen); return VOLSERREAD_DUMPERROR; } code = DumpFile(iodp, vnodeNumber, fdP); @@ -1140,6 +1146,7 @@ ProcessIndex(Volume * vp, VnodeClass class, afs_foff_t ** Bufp, int *sizep, struct VnodeClassInfo *vcp = &VnodeClassInfo[class]; char buf[SIZEOF_LARGEDISKVNODE], zero[SIZEOF_LARGEDISKVNODE]; struct VnodeDiskObject *vnode = (struct VnodeDiskObject *)buf; + afs_ino_str_t stmp; memset(zero, 0, sizeof(zero)); /* zero out our proto-vnode */ fdP = IH_OPEN(vp->vnodeIndex[class].handle); @@ -1158,9 +1165,12 @@ ProcessIndex(Volume * vp, VnodeClass class, afs_foff_t ** Bufp, int *sizep, if (vnode->type != vNull && VNDISK_GET_INO(vnode)) { cnt1++; if (DoLogging) { - Log("RestoreVolume %u Cleanup: Removing old vnode=%u inode=%llu size=unknown\n", - V_id(vp), bitNumberToVnodeNumber(i, class), - (afs_uintmax_t) VNDISK_GET_INO(vnode)); + Log("RestoreVolume %"AFS_VOLID_FMT" " + "Cleanup: Removing old vnode=%u inode=%s " + "size=unknown\n", + afs_printable_VolumeId_lu(V_id(vp)), + bitNumberToVnodeNumber(i, class), + PrintInode(stmp, VNDISK_GET_INO(vnode))); } IH_DEC(V_linkHandle(vp), VNDISK_GET_INO(vnode), V_parentId(vp)); @@ -1796,7 +1806,7 @@ SizeDumpDumpHeader(struct iod *iodp, Volume * vp, } static int -SizeDumpVnode(struct iod *iodp, struct VnodeDiskObject *v, int volid, +SizeDumpVnode(struct iod *iodp, struct VnodeDiskObject *v, VolumeId volid, int vnodeNumber, int dumpEverything, struct volintSize *v_size) { diff --git a/src/volser/vol-dump.c b/src/volser/vol-dump.c index f8ed4be..554ecf0 100644 --- a/src/volser/vol-dump.c +++ b/src/volser/vol-dump.c @@ -675,7 +675,7 @@ DumpFile(int dumpfd, int vnode, FdHandle_t * handleP, struct VnodeDiskObject *v static int -DumpVnode(int dumpfd, struct VnodeDiskObject *v, int volid, int vnodeNumber, +DumpVnode(int dumpfd, struct VnodeDiskObject *v, VolumeId volid, int vnodeNumber, int dumpEverything, struct Volume *vp) { int code = 0; @@ -725,9 +725,10 @@ DumpVnode(int dumpfd, struct VnodeDiskObject *v, int volid, int vnodeNumber, fdP = IH_OPEN(ihP); if (fdP == NULL) { fprintf(stderr, - "Unable to open inode %s for vnode %u (volume %i); not dumped, error %d\n", - PrintInode(stmp, VNDISK_GET_INO(v)), vnodeNumber, volid, - errno); + "Unable to open inode %s for vnode %u " + "(volume %"AFS_VOLID_FMT"); not dumped, error %d\n", + PrintInode(stmp, VNDISK_GET_INO(v)), vnodeNumber, + afs_printable_VolumeId_lu(volid), errno); } else {