Module Name: src
Committed By: uebayasi
Date: Tue Feb 23 06:58:07 UTC 2010
Modified Files:
src/sys/kern [uebayasi-xip]: vfs_syscalls.c
src/sys/sys [uebayasi-xip]: fstypes.h
Log Message:
More bits to pass the new XIP mount option correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.403 -r1.403.2.1 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.26.14.1 -r1.26.14.2 src/sys/sys/fstypes.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.403 src/sys/kern/vfs_syscalls.c:1.403.2.1
--- src/sys/kern/vfs_syscalls.c:1.403 Fri Jan 15 01:00:46 2010
+++ src/sys/kern/vfs_syscalls.c Tue Feb 23 06:58:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.403 2010/01/15 01:00:46 pooka Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.403.2.1 2010/02/23 06:58:07 uebayasi Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.403 2010/01/15 01:00:46 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.403.2.1 2010/02/23 06:58:07 uebayasi Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -200,12 +200,12 @@
~(MNT_NOSUID | MNT_NOEXEC | MNT_NODEV |
MNT_SYNCHRONOUS | MNT_UNION | MNT_ASYNC | MNT_NOCOREDUMP |
MNT_NOATIME | MNT_NODEVMTIME | MNT_SYMPERM | MNT_SOFTDEP |
- MNT_LOG);
+ MNT_LOG | MNT_XIP);
mp->mnt_flag |= flags &
(MNT_NOSUID | MNT_NOEXEC | MNT_NODEV |
MNT_SYNCHRONOUS | MNT_UNION | MNT_ASYNC | MNT_NOCOREDUMP |
MNT_NOATIME | MNT_NODEVMTIME | MNT_SYMPERM | MNT_SOFTDEP |
- MNT_LOG | MNT_IGNORE);
+ MNT_LOG | MNT_XIP | MNT_IGNORE);
error = VFS_MOUNT(mp, path, data, data_len);
@@ -357,7 +357,7 @@
(MNT_FORCE | MNT_NOSUID | MNT_NOEXEC | MNT_NODEV |
MNT_SYNCHRONOUS | MNT_UNION | MNT_ASYNC | MNT_NOCOREDUMP |
MNT_NOATIME | MNT_NODEVMTIME | MNT_SYMPERM | MNT_SOFTDEP |
- MNT_LOG | MNT_IGNORE | MNT_RDONLY);
+ MNT_LOG | MNT_XIP | MNT_IGNORE | MNT_RDONLY);
mutex_enter(&mp->mnt_updating);
error = VFS_MOUNT(mp, path, data, data_len);
Index: src/sys/sys/fstypes.h
diff -u src/sys/sys/fstypes.h:1.26.14.1 src/sys/sys/fstypes.h:1.26.14.2
--- src/sys/sys/fstypes.h:1.26.14.1 Thu Feb 11 05:20:28 2010
+++ src/sys/sys/fstypes.h Tue Feb 23 06:58:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fstypes.h,v 1.26.14.1 2010/02/11 05:20:28 uebayasi Exp $ */
+/* $NetBSD: fstypes.h,v 1.26.14.2 2010/02/23 06:58:06 uebayasi Exp $ */
/*
* Copyright (c) 1989, 1991, 1993
@@ -86,7 +86,6 @@
#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 */
@@ -97,6 +96,7 @@
#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,11 +113,12 @@
{ 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.
@@ -178,7 +179,8 @@
MNT_LOCAL | \
MNT_QUOTA | \
MNT_ROOTFS | \
- MNT_LOG)
+ MNT_LOG | \
+ MNT_XIP)
/*
* External filesystem control flags.
@@ -227,7 +229,7 @@
"\34MNT_EXNORESPORT" \
"\33MNT_NOATIME" \
"\32MNT_LOG" \
- "\31MNT_UNUSED" \
+ "\31MNT_XIP" \
"\30MNT_UNUSED" \
"\27MNT_GETARGS" \
"\26MNT_UNUSED" \
