[src/trunk]: src/sys/ufs mp->mnt_stat.f_flag is never set. Use the mnt_flag d...

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

details:   https://anonhg.NetBSD.org/src/rev/82a9debb0565
branches:  trunk
changeset: 809445:82a9debb0565
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sat Jul 11 11:04:48 2015 +0000

description:
mp->mnt_stat.f_flag is never set. Use the mnt_flag directly.
This will now actually prevent the 'bad dir' panic if the filesystem
is read-only.

diffstat:

 sys/ufs/lfs/ulfs_lookup.c |  6 +++---
 sys/ufs/ufs/ufs_lookup.c  |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r ced8f38a4aac -r 82a9debb0565 sys/ufs/lfs/ulfs_lookup.c
--- a/sys/ufs/lfs/ulfs_lookup.c Sat Jul 11 10:32:45 2015 +0000
+++ b/sys/ufs/lfs/ulfs_lookup.c Sat Jul 11 11:04:48 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ulfs_lookup.c,v 1.24 2015/05/31 15:48:03 hannken Exp $ */
+/*     $NetBSD: ulfs_lookup.c,v 1.25 2015/07/11 11:04:48 mlelstv Exp $ */
 /*  from NetBSD: ufs_lookup.c,v 1.122 2013/01/22 09:39:18 dholland Exp  */
 
 /*
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.24 2015/05/31 15:48:03 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.25 2015/07/11 11:04:48 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_lfs.h"
@@ -657,7 +657,7 @@
        printf("%s: bad dir ino %llu at offset %d: %s\n",
            mp->mnt_stat.f_mntonname, (unsigned long long)ip->i_number,
            offset, how);
-       if ((mp->mnt_stat.f_flag & MNT_RDONLY) == 0)
+       if ((mp->mnt_flag & MNT_RDONLY) == 0)
                panic("bad dir");
 }
 
diff -r ced8f38a4aac -r 82a9debb0565 sys/ufs/ufs/ufs_lookup.c
--- a/sys/ufs/ufs/ufs_lookup.c  Sat Jul 11 10:32:45 2015 +0000
+++ b/sys/ufs/ufs/ufs_lookup.c  Sat Jul 11 11:04:48 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_lookup.c,v 1.134 2015/03/28 17:23:42 maxv Exp $    */
+/*     $NetBSD: ufs_lookup.c,v 1.135 2015/07/11 11:04:48 mlelstv Exp $ */
 
 /*
  * Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.134 2015/03/28 17:23:42 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.135 2015/07/11 11:04:48 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ffs.h"
@@ -657,7 +657,7 @@
        printf("%s: bad dir ino %llu at offset %d: %s\n",
            mp->mnt_stat.f_mntonname, (unsigned long long)ip->i_number,
            offset, how);
-       if ((mp->mnt_stat.f_flag & MNT_RDONLY) == 0)
+       if ((mp->mnt_flag & MNT_RDONLY) == 0)
                panic("bad dir");
 }