CVS commit: src

[NONAKA Kimihiro]

Module Name:    src
Committed By:   nonaka
Date:           Sun Jan 29 00:58:14 UTC 2012

Modified Files:
        src/sbin/fsck_ffs: setup.c
        src/sys/ufs/ffs: ffs_vfsops.c

Log Message:
use FS_UFS[12]_MAGIC_SWAPPED instead of bswap32(FS_UFS[12]_MAGIC).


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sbin/fsck_ffs/setup.c
cvs rdiff -u -r1.274 -r1.275 src/sys/ufs/ffs/ffs_vfsops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sbin/fsck_ffs/setup.c
diff -u src/sbin/fsck_ffs/setup.c:1.94 src/sbin/fsck_ffs/setup.c:1.95
--- src/sbin/fsck_ffs/setup.c:1.94	Sun Aug 14 12:32:01 2011
+++ src/sbin/fsck_ffs/setup.c	Sun Jan 29 00:58:13 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: setup.c,v 1.94 2011/08/14 12:32:01 christos Exp $	*/
+/*	$NetBSD: setup.c,v 1.95 2012/01/29 00:58:13 nonaka Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c	8.10 (Berkeley) 5/9/95";
 #else
-__RCSID("$NetBSD: setup.c,v 1.94 2011/08/14 12:32:01 christos Exp $");
+__RCSID("$NetBSD: setup.c,v 1.95 2012/01/29 00:58:13 nonaka Exp $");
 #endif
 #endif /* not lint */
 
@@ -692,7 +692,7 @@ static int
 detect_byteorder(struct fs *fs, int sblockoff)
 {
 	if (sblockoff == SBLOCK_UFS2 && (fs->fs_magic == FS_UFS1_MAGIC ||
-	    fs->fs_magic == bswap32(FS_UFS1_MAGIC)))
+	    fs->fs_magic == FS_UFS1_MAGIC_SWAPPED))
 		/* Likely to be the first alternate of a fs with 64k blocks */
 		return -1;
 	if (fs->fs_magic == FS_UFS1_MAGIC || fs->fs_magic == FS_UFS2_MAGIC) {
@@ -704,8 +704,8 @@ detect_byteorder(struct fs *fs, int sblo
 			doswap = do_blkswap = do_dirswap = 1;
 		}
 		return 0;
-	} else if (fs->fs_magic == bswap32(FS_UFS1_MAGIC) ||
-		   fs->fs_magic == bswap32(FS_UFS2_MAGIC)) {
+	} else if (fs->fs_magic == FS_UFS1_MAGIC_SWAPPED ||
+		   fs->fs_magic == FS_UFS2_MAGIC_SWAPPED) {
 		if (endian == 0 || BYTE_ORDER != endian) {
 			needswap = 1;
 			doswap = do_blkswap = do_dirswap = 0;

Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.274 src/sys/ufs/ffs/ffs_vfsops.c:1.275
--- src/sys/ufs/ffs/ffs_vfsops.c:1.274	Sat Jan 28 00:00:06 2012
+++ src/sys/ufs/ffs/ffs_vfsops.c	Sun Jan 29 00:58:14 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_vfsops.c,v 1.274 2012/01/28 00:00:06 rmind Exp $	*/
+/*	$NetBSD: ffs_vfsops.c,v 1.275 2012/01/29 00:58:14 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.274 2012/01/28 00:00:06 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.275 2012/01/29 00:58:14 nonaka Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -927,7 +927,7 @@ ffs_mountfs(struct vnode *devvp, struct 
 			fsbsize = fs->fs_bsize;
 #ifdef FFS_EI
 			needswap = 0;
-		} else if (fs->fs_magic == bswap32(FS_UFS1_MAGIC)) {
+		} else if (fs->fs_magic == FS_UFS1_MAGIC_SWAPPED) {
 			sbsize = bswap32(fs->fs_sbsize);
 			fstype = UFS1;
 			fsbsize = bswap32(fs->fs_bsize);
@@ -939,7 +939,7 @@ ffs_mountfs(struct vnode *devvp, struct 
 			fsbsize = fs->fs_bsize;
 #ifdef FFS_EI
 			needswap = 0;
-		} else if (fs->fs_magic == bswap32(FS_UFS2_MAGIC)) {
+		} else if (fs->fs_magic == FS_UFS2_MAGIC_SWAPPED) {
 			sbsize = bswap32(fs->fs_sbsize);
 			fstype = UFS2;
 			fsbsize = bswap32(fs->fs_bsize);