Module Name: src
Committed By: uebayasi
Date: Mon May 31 03:29:43 UTC 2010
Modified Files:
src/sys/kern [uebayasi-xip]: vfs_syscalls.c
Log Message:
Remove the "xip" option from mount_ffs(8) for simplicity.
To generate a diff of this commit:
cvs rdiff -u -r1.403.2.2 -r1.403.2.3 src/sys/kern/vfs_syscalls.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/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.403.2.2 src/sys/kern/vfs_syscalls.c:1.403.2.3
--- src/sys/kern/vfs_syscalls.c:1.403.2.2 Fri Apr 30 14:44:14 2010
+++ src/sys/kern/vfs_syscalls.c Mon May 31 03:29:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.403.2.2 2010/04/30 14:44:14 uebayasi Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.403.2.3 2010/05/31 03:29:43 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.2.2 2010/04/30 14:44:14 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.403.2.3 2010/05/31 03:29:43 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_XIP);
+ MNT_LOG);
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_XIP | MNT_IGNORE);
+ MNT_LOG | 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_XIP | MNT_IGNORE | MNT_RDONLY);
+ MNT_LOG | MNT_IGNORE | MNT_RDONLY);
mutex_enter(&mp->mnt_updating);
error = VFS_MOUNT(mp, path, data, data_len);