[src/trunk]: src/sys/ufs/ffs remove code that attempts to correct superblock ...

[dbj <dbj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a0f651e21b6a
branches:  trunk
changeset: 565687:a0f651e21b6a
user:      dbj <dbj%NetBSD.org@localhost>
date:      Sun Apr 18 03:35:16 2004 +0000

description:
remove code that attempts to correct superblock location.  this
enforces an unnecessary restriction that the superblock be in the
particular expected locations.  Also, the compatibility case is
handled in ffs_oldfscompat_read.

diffstat:

 sys/ufs/ffs/ffs_vfsops.c |  16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diffs (37 lines):

diff -r 4b9b5844470b -r a0f651e21b6a sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Sun Apr 18 03:30:23 2004 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Sun Apr 18 03:35:16 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_vfsops.c,v 1.141 2004/04/18 03:30:23 dbj Exp $     */
+/*     $NetBSD: ffs_vfsops.c,v 1.142 2004/04/18 03:35:16 dbj Exp $     */
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.141 2004/04/18 03:30:23 dbj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.142 2004/04/18 03:35:16 dbj Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -1638,18 +1638,6 @@
        saveflag = fs->fs_flags & FS_INTERNAL;
        fs->fs_flags &= ~FS_INTERNAL;
        
-       if (fs->fs_magic == FS_UFS1_MAGIC && fs->fs_sblockloc != SBLOCK_UFS1) {
-               printf("%s: correcting fs_sblockloc from %" PRId64 " to %d\n",
-                   fs->fs_fsmnt, fs->fs_sblockloc, SBLOCK_UFS1);
-               fs->fs_sblockloc = SBLOCK_UFS1;
-       }
-
-       if (fs->fs_magic == FS_UFS2_MAGIC && fs->fs_sblockloc != SBLOCK_UFS2) {
-               printf("%s: correcting fs_sblockloc from %" PRId64 " to %d\n",
-                   fs->fs_fsmnt, fs->fs_sblockloc, SBLOCK_UFS2);
-               fs->fs_sblockloc = SBLOCK_UFS2;
-       }
-
        memcpy(bp->b_data, fs, fs->fs_sbsize);
 
        ffs_oldfscompat_write((struct fs *)bp->b_data, mp);