Module Name: src
Committed By: uebayasi
Date: Tue Feb 23 07:00:58 UTC 2010
Modified Files:
src/sys/ufs/ffs [uebayasi-xip]: ffs_vfsops.c
Log Message:
Check XIP mount condition more nicely.
To generate a diff of this commit:
cvs rdiff -u -r1.257.2.1 -r1.257.2.2 src/sys/ufs/ffs/ffs_vfsops.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/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.1 src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.2
--- src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.1 Thu Feb 11 05:22:38 2010
+++ src/sys/ufs/ffs/ffs_vfsops.c Tue Feb 23 07:00:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.257.2.1 2010/02/11 05:22:38 uebayasi Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.257.2.2 2010/02/23 07:00:58 uebayasi Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.257.2.1 2010/02/11 05:22:38 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.257.2.2 2010/02/23 07:00:58 uebayasi Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -1176,11 +1176,18 @@
mp->mnt_iflag |= IMNT_MPSAFE;
#ifdef XIP
paddr_t phys_addr = 0;
- if ((VOP_IOCTL(devvp, DIOCGPHYSADDR, &phys_addr, FREAD,
- cred) == 0) &&
- phys_addr != 0) {
- mp->mnt_iflag |= IMNT_XIP;
- mp->mnt_phys_addr = phys_addr;
+ if (mp->mnt_flag & MNT_XIP) {
+ if ((mp->mnt_flag & MNT_RDONLY) == 0)
+ printf("XIP needs read-only mount\n");
+ else {
+ if ((VOP_IOCTL(devvp, DIOCGPHYSADDR, &phys_addr, FREAD,
+ cred) == 0) &&
+ phys_addr != 0) {
+ mp->mnt_iflag |= IMNT_XIP;
+ mp->mnt_phys_addr = phys_addr;
+ } else
+ printf("device doesn't support DIOCGPHYSADDR\n");
+ }
}
#endif
#ifdef FFS_EI
