Deleted Added
full compact
linux_file.c (188588) linux_file.c (190445)
1/*-
2 * Copyright (c) 1994-1995 S�ren Schmidt
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1994-1995 S�ren Schmidt
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/compat/linux/linux_file.c 188588 2009-02-13 18:18:14Z jhb $");
30__FBSDID("$FreeBSD: head/sys/compat/linux/linux_file.c 190445 2009-03-26 17:14:22Z ambrisko $");
31
32#include "opt_compat.h"
33#include "opt_mac.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>
37#include <sys/conf.h>
38#include <sys/dirent.h>

--- 1065 unchanged lines hidden (view full) ---

1104 ufs.fspec = mntfromname;
1105#define DEFAULT_ROOTID -2
1106 ufs.export.ex_root = DEFAULT_ROOTID;
1107 ufs.export.ex_flags =
1108 args->rwflag & LINUX_MS_RDONLY ? MNT_EXRDONLY : 0;
1109 } else if (strcmp(fstypename, "proc") == 0) {
1110 strcpy(fstypename, "linprocfs");
1111 fsdata = NULL;
31
32#include "opt_compat.h"
33#include "opt_mac.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>
37#include <sys/conf.h>
38#include <sys/dirent.h>

--- 1065 unchanged lines hidden (view full) ---

1104 ufs.fspec = mntfromname;
1105#define DEFAULT_ROOTID -2
1106 ufs.export.ex_root = DEFAULT_ROOTID;
1107 ufs.export.ex_flags =
1108 args->rwflag & LINUX_MS_RDONLY ? MNT_EXRDONLY : 0;
1109 } else if (strcmp(fstypename, "proc") == 0) {
1110 strcpy(fstypename, "linprocfs");
1111 fsdata = NULL;
1112 } else if (strcmp(fstypename, "vfat") == 0) {
1113 strcpy(fstypename, "msdosfs");
1114 fsdata = NULL;
1112 } else {
1113 return (ENODEV);
1114 }
1115
1116 fsflags = 0;
1117
1118 if ((args->rwflag & 0xffff0000) == 0xc0ed0000) {
1119 /*

--- 10 unchanged lines hidden (view full) ---

1130 fsflags |= MNT_UPDATE;
1131 }
1132
1133 if (strcmp(fstypename, "linprocfs") == 0) {
1134 error = kernel_vmount(fsflags,
1135 "fstype", fstypename,
1136 "fspath", mntonname,
1137 NULL);
1115 } else {
1116 return (ENODEV);
1117 }
1118
1119 fsflags = 0;
1120
1121 if ((args->rwflag & 0xffff0000) == 0xc0ed0000) {
1122 /*

--- 10 unchanged lines hidden (view full) ---

1133 fsflags |= MNT_UPDATE;
1134 }
1135
1136 if (strcmp(fstypename, "linprocfs") == 0) {
1137 error = kernel_vmount(fsflags,
1138 "fstype", fstypename,
1139 "fspath", mntonname,
1140 NULL);
1141 } else if (strcmp(fstypename, "msdosfs") == 0) {
1142 error = kernel_vmount(fsflags,
1143 "fstype", fstypename,
1144 "fspath", mntonname,
1145 "from", mntfromname,
1146 NULL);
1138 } else
1139 error = EOPNOTSUPP;
1140 return (error);
1141}
1142
1143int
1144linux_oldumount(struct thread *td, struct linux_oldumount_args *args)
1145{

--- 381 unchanged lines hidden ---
1147 } else
1148 error = EOPNOTSUPP;
1149 return (error);
1150}
1151
1152int
1153linux_oldumount(struct thread *td, struct linux_oldumount_args *args)
1154{

--- 381 unchanged lines hidden ---