[src/netbsd-1-4]: src/sys/ufs/ffs Pull up revision 1.56 (via patch, requested...

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

details:   https://anonhg.NetBSD.org/src/rev/4208dfd9a970
branches:  netbsd-1-4
changeset: 469897:4208dfd9a970
user:      he <he%NetBSD.org@localhost>
date:      Mon Dec 20 13:16:30 1999 +0000

description:
Pull up revision 1.56 (via patch, requested by drochner):
  Fix the use of an uninitialized variable.  This could be triggered
  if the file system to be mounted is a pre-BSD4.4 one (which can
  result in the old file system being rejected).

diffstat:

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

diffs (26 lines):

diff -r 1c83cc8abe97 -r 4208dfd9a970 sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Sat Dec 18 17:07:24 1999 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Mon Dec 20 13:16:30 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_vfsops.c,v 1.49.2.1 1999/10/18 05:05:34 cgd Exp $  */
+/*     $NetBSD: ffs_vfsops.c,v 1.49.2.2 1999/12/20 13:16:30 he Exp $   */
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -530,6 +530,8 @@
        if (needswap)
                ffs_sb_swap((struct fs*)bp->b_data, fs, 0);
 #endif
+       ffs_oldfscompat(fs);
+
        if (fs->fs_bsize > MAXBSIZE || fs->fs_bsize < sizeof(struct fs)) {
                error = EINVAL;
                goto out;
@@ -610,7 +612,6 @@
        for (i = 0; i < MAXQUOTAS; i++)
                ump->um_quotas[i] = NULLVP;
        devvp->v_specflags |= SI_MOUNTEDON;
-       ffs_oldfscompat(fs);
        ump->um_savedmaxfilesize = fs->fs_maxfilesize;          /* XXX */
        maxfilesize = (u_int64_t)0x80000000 * fs->fs_bsize - 1; /* XXX */
        if (fs->fs_maxfilesize > maxfilesize)                   /* XXX */