From: Nathan Scott <nathans@sgi.com>
Date: Thu, 8 May 2003 05:35:00 +0000 (+0000)
Subject: Fix a bug on an error path in xfs_logprint.
X-Git-Tag: XFS-1_3_0pre1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7134dda240c0423e94347b09033d589782ac7c0;p=thirdparty%2Fxfsprogs-dev.git

Fix a bug on an error path in xfs_logprint.
---

diff --git a/doc/CHANGES b/doc/CHANGES
index 90451929a..828098e76 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+[cvs]
+	- Fix a bug in xfs_logprint, when dumping a corrupt log.
+	- FreeBSD updates from Alexander Kabaev.
+
 xfsprogs-2.4.9 (03 May 2003)
 	- Allow xfs_repair to run on read-only filesystems.
 
diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index 55f7d279b..ac78e40a2 100644
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2001 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -861,8 +861,8 @@ xlog_print_lseek(xlog_t *log, int fd, xfs_daddr_t blkno, int whence)
 	else
 		offset = BBTOOFF64(blkno);
 	if (lseek64(fd, offset, whence) < 0) {
-		fprintf(stderr, "%s: lseek64 to %llu failed: %s\n",
-			progname, (unsigned long long)offset, strerror(errno));
+		fprintf(stderr, "%s: lseek64 to %lld failed: %s\n",
+			progname, (long long)offset, strerror(errno));
 		exit(1);
 	}
 }	/* xlog_print_lseek */
@@ -940,7 +940,6 @@ xlog_print_record(int		  fd,
     for (i = 0; ptr < buf + read_len; ptr += BBSIZE, i++) {
 	rechead = (xlog_rec_header_t *)ptr;
 	if (INT_GET(rechead->h_magicno, ARCH_CONVERT) == XLOG_HEADER_MAGIC_NUM) {
-	    xlog_print_lseek(0, fd, -read_len+i*BBSIZE, SEEK_CUR);
 	    free(buf);
 	    return -1;
 	} else {