Module Name: src
Committed By: mlelstv
Date: Sat Jul 11 11:04:48 UTC 2015
Modified Files:
src/sys/ufs/lfs: ulfs_lookup.c
src/sys/ufs/ufs: ufs_lookup.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/ufs/lfs/ulfs_lookup.c
cvs rdiff -u -r1.134 -r1.135 src/sys/ufs/ufs/ufs_lookup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/ulfs_lookup.c
diff -u src/sys/ufs/lfs/ulfs_lookup.c:1.24 src/sys/ufs/lfs/ulfs_lookup.c:1.25
--- src/sys/ufs/lfs/ulfs_lookup.c:1.24 Sun May 31 15:48:03 2015
+++ src/sys/ufs/lfs/ulfs_lookup.c Sat Jul 11 11:04:48 2015
@@ -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 @@ ulfs_dirbad(struct inode *ip, doff_t off
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");
}
Index: src/sys/ufs/ufs/ufs_lookup.c
diff -u src/sys/ufs/ufs/ufs_lookup.c:1.134 src/sys/ufs/ufs/ufs_lookup.c:1.135
--- src/sys/ufs/ufs/ufs_lookup.c:1.134 Sat Mar 28 17:23:42 2015
+++ src/sys/ufs/ufs/ufs_lookup.c Sat Jul 11 11:04:48 2015
@@ -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 @@ ufs_dirbad(struct inode *ip, doff_t offs
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");
}
