Module Name: src
Committed By: uebayasi
Date: Fri May 28 09:14:56 UTC 2010
Modified Files:
src/sbin/mount [uebayasi-xip]: mount.8
src/sbin/mount_ffs [uebayasi-xip]: mount_ffs.c
src/sys/sys [uebayasi-xip]: fstypes.h
src/sys/ufs/ffs [uebayasi-xip]: ffs_vfsops.c
Log Message:
Remove the "xip" option from mount_ffs(8) for simplicity.
To generate a diff of this commit:
cvs rdiff -u -r1.69.2.1 -r1.69.2.2 src/sbin/mount/mount.8
cvs rdiff -u -r1.25.10.1 -r1.25.10.2 src/sbin/mount_ffs/mount_ffs.c
cvs rdiff -u -r1.26.14.2 -r1.26.14.3 src/sys/sys/fstypes.h
cvs rdiff -u -r1.257.2.5 -r1.257.2.6 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/sbin/mount/mount.8
diff -u src/sbin/mount/mount.8:1.69.2.1 src/sbin/mount/mount.8:1.69.2.2
--- src/sbin/mount/mount.8:1.69.2.1 Thu Feb 11 05:36:16 2010
+++ src/sbin/mount/mount.8 Fri May 28 09:14:55 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: mount.8,v 1.69.2.1 2010/02/11 05:36:16 uebayasi Exp $
+.\" $NetBSD: mount.8,v 1.69.2.2 2010/05/28 09:14:55 uebayasi Exp $
.\"
.\" Copyright (c) 1980, 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -299,8 +299,6 @@
The same as
.Fl u ;
indicate that the status of an already mounted file system should be changed.
-.It Cm xip
-Enable eXecute-In-Place if the block device supports it.
.El
.Pp
Any additional options specific to a given file system type (see the
Index: src/sbin/mount_ffs/mount_ffs.c
diff -u src/sbin/mount_ffs/mount_ffs.c:1.25.10.1 src/sbin/mount_ffs/mount_ffs.c:1.25.10.2
--- src/sbin/mount_ffs/mount_ffs.c:1.25.10.1 Thu Feb 11 05:38:20 2010
+++ src/sbin/mount_ffs/mount_ffs.c Fri May 28 09:14:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_ffs.c,v 1.25.10.1 2010/02/11 05:38:20 uebayasi Exp $ */
+/* $NetBSD: mount_ffs.c,v 1.25.10.2 2010/05/28 09:14:55 uebayasi Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)mount_ufs.c 8.4 (Berkeley) 4/26/95";
#else
-__RCSID("$NetBSD: mount_ffs.c,v 1.25.10.1 2010/02/11 05:38:20 uebayasi Exp $");
+__RCSID("$NetBSD: mount_ffs.c,v 1.25.10.2 2010/05/28 09:14:55 uebayasi Exp $");
#endif
#endif /* not lint */
@@ -74,7 +74,6 @@
MOPT_SOFTDEP,
MOPT_LOG,
MOPT_GETARGS,
- MOPT_XIP,
MOPT_NULL,
};
Index: src/sys/sys/fstypes.h
diff -u src/sys/sys/fstypes.h:1.26.14.2 src/sys/sys/fstypes.h:1.26.14.3
--- src/sys/sys/fstypes.h:1.26.14.2 Tue Feb 23 06:58:06 2010
+++ src/sys/sys/fstypes.h Fri May 28 09:14:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fstypes.h,v 1.26.14.2 2010/02/23 06:58:06 uebayasi Exp $ */
+/* $NetBSD: fstypes.h,v 1.26.14.3 2010/05/28 09:14:55 uebayasi Exp $ */
/*
* Copyright (c) 1989, 1991, 1993
@@ -86,6 +86,7 @@
#define __MNT_UNUSED1 0x00020000
#define __MNT_UNUSED2 0x00200000
#define __MNT_UNUSED3 0x00800000
+#define __MNT_UNUSED4 0x01000000
#define MNT_RDONLY 0x00000001 /* read only filesystem */
#define MNT_SYNCHRONOUS 0x00000002 /* file system written synchronously */
@@ -96,7 +97,6 @@
#define MNT_ASYNC 0x00000040 /* file system written asynchronously */
#define MNT_NOCOREDUMP 0x00008000 /* don't write core dumps to this FS */
#define MNT_IGNORE 0x00100000 /* don't show entry in df */
-#define MNT_XIP 0x01000000 /* eXecute-In-Place */
#define MNT_LOG 0x02000000 /* Use logging */
#define MNT_NOATIME 0x04000000 /* Never update access times in fs */
#define MNT_SYMPERM 0x20000000 /* recognize symlink permission */
@@ -113,12 +113,11 @@
{ MNT_ASYNC, 0, "asynchronous" }, \
{ MNT_NOCOREDUMP, 0, "nocoredump" }, \
{ MNT_IGNORE, 0, "hidden" }, \
- { MNT_XIP, 0, "xip" }, \
- { MNT_LOG, 0, "log" }, \
{ MNT_NOATIME, 0, "noatime" }, \
{ MNT_SYMPERM, 0, "symperm" }, \
{ MNT_NODEVMTIME, 0, "nodevmtime" }, \
{ MNT_SOFTDEP, 0, "soft dependencies" }, \
+ { MNT_LOG, 0, "log" },
/*
* exported mount flags.
@@ -179,8 +178,7 @@
MNT_LOCAL | \
MNT_QUOTA | \
MNT_ROOTFS | \
- MNT_LOG | \
- MNT_XIP)
+ MNT_LOG)
/*
* External filesystem control flags.
@@ -229,7 +227,7 @@
"\34MNT_EXNORESPORT" \
"\33MNT_NOATIME" \
"\32MNT_LOG" \
- "\31MNT_XIP" \
+ "\31MNT_UNUSED" \
"\30MNT_UNUSED" \
"\27MNT_GETARGS" \
"\26MNT_UNUSED" \
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.5 src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.6
--- src/sys/ufs/ffs/ffs_vfsops.c:1.257.2.5 Fri Apr 30 14:44:34 2010
+++ src/sys/ufs/ffs/ffs_vfsops.c Fri May 28 09:14:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.257.2.5 2010/04/30 14:44:34 uebayasi Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.257.2.6 2010/05/28 09:14:55 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.5 2010/04/30 14:44:34 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.257.2.6 2010/05/28 09:14:55 uebayasi Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -1170,19 +1170,18 @@
mp->mnt_flag |= MNT_LOCAL;
mp->mnt_iflag |= IMNT_MPSAFE;
#ifdef XIP
- void *physseg = 0;
- 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, &physseg, FREAD,
- cred) == 0) &&
- physseg != NULL) {
- mp->mnt_iflag |= IMNT_XIP;
- devvp->v_physseg = physseg;
- } else
- printf("device doesn't support DIOCGPHYSADDR\n");
- }
+ if ((mp->mnt_flag & MNT_RDONLY) == 0)
+ printf("XIP needs read-only mount\n");
+ else {
+ void *physseg = NULL;
+
+ if ((VOP_IOCTL(devvp, DIOCGPHYSADDR, &physseg, FREAD,
+ cred) == 0) &&
+ physseg != NULL) {
+ mp->mnt_iflag |= IMNT_XIP;
+ devvp->v_physseg = physseg;
+ } else
+ printf("device doesn't support DIOCGPHYSADDR\n");
}
#endif
#ifdef FFS_EI
