From: "Barry Naujok" <bnaujok@melbourne.sgi.com>
To: xfs@oss.sgi.com
Subject: RE: REVIEW: 031 QA failure with xfs_repair
Date: Tue, 16 Jan 2007 12:12:18 +1100 [thread overview]
Message-ID: <200701160106.MAA22290@larry.melbourne.sgi.com> (raw)
In-Reply-To: <200701160045.LAA21869@larry.melbourne.sgi.com>
[-- Attachment #1: Type: text/plain, Size: 610 bytes --]
Well, Dave has already replied, but here is the patch again with out the
line break crap and tabs intact.
> -----Original Message-----
> From: xfs-bounce@oss.sgi.com [mailto:xfs-bounce@oss.sgi.com]
> On Behalf Of Barry Naujok
> Sent: Tuesday, 16 January 2007 11:51 AM
> To: xfs@oss.sgi.com
> Subject: FW: REVIEW: 031 QA failure with xfs_repair
>
>
> QA 030 and 031 are failing with xfs_repair as the "zeroed log" is
> different
> on IRIX and Linux.
>
> xfs_repair must be coded to handle the different platform log
> formats.
>
> ==========================
>
> Need a review please:
(see attached)
[-- Attachment #2: 031-fix.diff --]
[-- Type: application/octet-stream, Size: 3407 bytes --]
===========================================================================
xfsprogs/libxfs/darwin.c
===========================================================================
--- /usr/tmp/TmpDir.5868489-0/xfsprogs/libxfs/darwin.c_1.12 Mon Jan 15 17:30:37 2007
+++ xfsprogs/libxfs/darwin.c Mon Jan 15 16:53:25 2007
@@ -22,6 +22,7 @@
#include <sys/ioctl.h>
#include <xfs/libxfs.h>
+int platform_has_uuid = 0;
extern char *progname;
int
===========================================================================
xfsprogs/libxfs/freebsd.c
===========================================================================
--- /usr/tmp/TmpDir.5868489-0/xfsprogs/libxfs/freebsd.c_1.15 Mon Jan 15 17:30:37 2007
+++ xfsprogs/libxfs/freebsd.c Mon Jan 15 16:53:35 2007
@@ -22,6 +22,7 @@
#include <sys/mount.h>
#include <sys/ioctl.h>
+int platform_has_uuid = 0;
extern char *progname;
int
===========================================================================
xfsprogs/libxfs/init.h
===========================================================================
--- /usr/tmp/TmpDir.5868489-0/xfsprogs/libxfs/init.h_1.12 Mon Jan 15 17:30:37 2007
+++ xfsprogs/libxfs/init.h Mon Jan 15 16:52:09 2007
@@ -34,5 +34,6 @@
extern int platform_align_blockdev (void);
extern int platform_aio_init (int aio_count);
extern int platform_nproc(void);
+extern int platform_has_uuid;
#endif /* LIBXFS_INIT_H */
===========================================================================
xfsprogs/libxfs/irix.c
===========================================================================
--- /usr/tmp/TmpDir.5868489-0/xfsprogs/libxfs/irix.c_1.13 Mon Jan 15 17:30:37 2007
+++ xfsprogs/libxfs/irix.c Mon Jan 15 16:53:49 2007
@@ -21,6 +21,7 @@
#include <diskinfo.h>
#include <sys/sysmp.h>
+int platform_has_uuid = 0;
extern char *progname;
extern __int64_t findsize(char *);
===========================================================================
xfsprogs/libxfs/linux.c
===========================================================================
--- /usr/tmp/TmpDir.5868489-0/xfsprogs/libxfs/linux.c_1.16 Mon Jan 15 17:30:37 2007
+++ xfsprogs/libxfs/linux.c Mon Jan 15 16:53:10 2007
@@ -26,6 +26,7 @@
#include <sys/mount.h>
#include <sys/ioctl.h>
+int platform_has_uuid = 1;
extern char *progname;
static int max_block_alignment;
===========================================================================
xfsprogs/libxlog/xfs_log_recover.c
===========================================================================
--- /usr/tmp/TmpDir.5868489-0/xfsprogs/libxlog/xfs_log_recover.c_1.30 Mon Jan 15 17:30:37 2007
+++ xfsprogs/libxlog/xfs_log_recover.c Mon Jan 15 16:54:50 2007
@@ -258,6 +258,7 @@
uint first_half_cycle, last_half_cycle;
uint stop_on_cycle;
int error, log_bbnum = log->l_logBBsize;
+ extern int platform_has_uuid;
/* Is the end of the log device zeroed? */
if ((error = xlog_find_zeroed(log, &first_blk)) == -1) {
@@ -264,7 +265,7 @@
*return_head_blk = first_blk;
/* Is the whole lot zeroed? */
- if (!first_blk) {
+ if (!first_blk && platform_has_uuid) {
/* Linux XFS shouldn't generate totally zeroed logs -
* mkfs etc write a dummy unmount record to a fresh
* log so we can store the uuid in there
prev parent reply other threads:[~2007-01-16 1:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-16 0:51 FW: REVIEW: 031 QA failure with xfs_repair Barry Naujok
2007-01-16 1:03 ` David Chinner
2007-01-16 1:12 ` Barry Naujok [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200701160106.MAA22290@larry.melbourne.sgi.com \
--to=bnaujok@melbourne.sgi.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox