[src/netbsd-1-6]: src/sys/ufs/ffs Pull up revision 1.121 via patch (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/becc77ca8fb7
branches:  netbsd-1-6
changeset: 530739:becc77ca8fb7
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Sep 24 11:02:14 2003 +0000

description:
Pull up revision 1.121 via patch (requested by bouyer in ticket #1464):
make sure to not get flags which are for internal use only from the on-disk
superblock.
Proposed in http://mail-index.netbsd.org/tech-kern/2003/09/06/0005.html

diffstat:

 sys/ufs/ffs/ffs_vfsops.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 183e11be8fa4 -r becc77ca8fb7 sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Mon Sep 22 12:03:44 2003 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Wed Sep 24 11:02:14 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_vfsops.c,v 1.98.4.1 2002/06/10 16:46:17 tv Exp $   */
+/*     $NetBSD: ffs_vfsops.c,v 1.98.4.2 2003/09/24 11:02:14 tron Exp $ */
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.98.4.1 2002/06/10 16:46:17 tv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.98.4.2 2003/09/24 11:02:14 tron Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -476,8 +476,9 @@
        if (VFSTOUFS(mountp)->um_flags & UFS_NEEDSWAP) {
                ffs_sb_swap((struct fs*)bp->b_data, newfs);
                fs->fs_flags |= FS_SWAPPED;
-       }
+       } else
 #endif
+               fs->fs_flags &= ~FS_SWAPPED;
        if (newfs->fs_magic != FS_MAGIC || newfs->fs_bsize > MAXBSIZE ||
            newfs->fs_bsize < sizeof(struct fs)) {
                brelse(bp);
@@ -680,8 +681,9 @@
        if (needswap) {
                ffs_sb_swap((struct fs*)bp->b_data, fs);
                fs->fs_flags |= FS_SWAPPED;
-       }
+       } else
 #endif
+               fs->fs_flags &= ~FS_SWAPPED;
        ffs_oldfscompat(fs);
 
        if (fs->fs_bsize > MAXBSIZE || fs->fs_bsize < sizeof(struct fs)) {