Deleted Added
sdiff udiff text old ( 99670 ) new ( 99687 )
full compact
linux_file.c (99670) linux_file.c (99687)
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

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

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
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 *
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

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

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
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 * $FreeBSD: head/sys/compat/linux/linux_file.c 99670 2002-07-09 15:57:12Z robert $
28 * $FreeBSD: head/sys/compat/linux/linux_file.c 99687 2002-07-09 19:25:43Z robert $
29 */
30
31#include "opt_compat.h"
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/conf.h>
36#include <sys/dirent.h>

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

1031
1032#ifdef DEBUG
1033 if (ldebug(fcntl))
1034 printf(ARGS(fcntl, "%d, %08x, *"), args->fd, args->cmd);
1035#endif
1036
1037 switch (args->cmd) {
1038 case LINUX_F_GETLK:
29 */
30
31#include "opt_compat.h"
32
33#include <sys/param.h>
34#include <sys/systm.h>
35#include <sys/conf.h>
36#include <sys/dirent.h>

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

1031
1032#ifdef DEBUG
1033 if (ldebug(fcntl))
1034 printf(ARGS(fcntl, "%d, %08x, *"), args->fd, args->cmd);
1035#endif
1036
1037 switch (args->cmd) {
1038 case LINUX_F_GETLK:
1039 case LINUX_F_GETLK64:
1040 error = copyin((caddr_t)args->arg, &linux_flock,
1041 sizeof(linux_flock));
1042 if (error)
1043 return (error);
1044 linux_to_bsd_flock(&linux_flock, bsd_flock);
1045 fcntl_args.fd = args->fd;
1046 fcntl_args.cmd = F_GETLK;
1047 fcntl_args.arg = (long)bsd_flock;
1048 error = fcntl(td, &fcntl_args);
1049 if (error)
1050 return (error);
1051 bsd_to_linux_flock(bsd_flock, &linux_flock);
1052 return (copyout(&linux_flock, (caddr_t)args->arg,
1053 sizeof(linux_flock)));
1054
1055 case LINUX_F_SETLK:
1039 error = copyin((caddr_t)args->arg, &linux_flock,
1040 sizeof(linux_flock));
1041 if (error)
1042 return (error);
1043 linux_to_bsd_flock(&linux_flock, bsd_flock);
1044 fcntl_args.fd = args->fd;
1045 fcntl_args.cmd = F_GETLK;
1046 fcntl_args.arg = (long)bsd_flock;
1047 error = fcntl(td, &fcntl_args);
1048 if (error)
1049 return (error);
1050 bsd_to_linux_flock(bsd_flock, &linux_flock);
1051 return (copyout(&linux_flock, (caddr_t)args->arg,
1052 sizeof(linux_flock)));
1053
1054 case LINUX_F_SETLK:
1056 case LINUX_F_SETLK64:
1057 error = copyin((caddr_t)args->arg, &linux_flock,
1058 sizeof(linux_flock));
1059 if (error)
1060 return (error);
1061 linux_to_bsd_flock(&linux_flock, bsd_flock);
1062 fcntl_args.fd = args->fd;
1063 fcntl_args.cmd = F_SETLK;
1064 fcntl_args.arg = (long)bsd_flock;
1065 return (fcntl(td, &fcntl_args));
1066
1067 case LINUX_F_SETLKW:
1055 error = copyin((caddr_t)args->arg, &linux_flock,
1056 sizeof(linux_flock));
1057 if (error)
1058 return (error);
1059 linux_to_bsd_flock(&linux_flock, bsd_flock);
1060 fcntl_args.fd = args->fd;
1061 fcntl_args.cmd = F_SETLK;
1062 fcntl_args.arg = (long)bsd_flock;
1063 return (fcntl(td, &fcntl_args));
1064
1065 case LINUX_F_SETLKW:
1068 case LINUX_F_SETLKW64:
1069 error = copyin((caddr_t)args->arg, &linux_flock,
1070 sizeof(linux_flock));
1071 if (error)
1072 return (error);
1073 linux_to_bsd_flock(&linux_flock, bsd_flock);
1074 fcntl_args.fd = args->fd;
1075 fcntl_args.cmd = F_SETLKW;
1076 fcntl_args.arg = (long)bsd_flock;

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

1098
1099#ifdef DEBUG
1100 if (ldebug(fcntl64))
1101 printf(ARGS(fcntl64, "%d, %08x, *"), args->fd, args->cmd);
1102#endif
1103
1104 switch (args->cmd) {
1105 case LINUX_F_GETLK:
1066 error = copyin((caddr_t)args->arg, &linux_flock,
1067 sizeof(linux_flock));
1068 if (error)
1069 return (error);
1070 linux_to_bsd_flock(&linux_flock, bsd_flock);
1071 fcntl_args.fd = args->fd;
1072 fcntl_args.cmd = F_SETLKW;
1073 fcntl_args.arg = (long)bsd_flock;

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

1095
1096#ifdef DEBUG
1097 if (ldebug(fcntl64))
1098 printf(ARGS(fcntl64, "%d, %08x, *"), args->fd, args->cmd);
1099#endif
1100
1101 switch (args->cmd) {
1102 case LINUX_F_GETLK:
1103 case LINUX_F_GETLK64:
1106 error = copyin((caddr_t)args->arg, &linux_flock,
1107 sizeof(linux_flock));
1108 if (error)
1109 return (error);
1110 linux_to_bsd_flock64(&linux_flock, bsd_flock);
1111 fcntl_args.fd = args->fd;
1112 fcntl_args.cmd = F_GETLK;
1113 fcntl_args.arg = (long)bsd_flock;
1114 error = fcntl(td, &fcntl_args);
1115 if (error)
1116 return (error);
1117 bsd_to_linux_flock64(bsd_flock, &linux_flock);
1118 return (copyout(&linux_flock, (caddr_t)args->arg,
1119 sizeof(linux_flock)));
1120
1121 case LINUX_F_SETLK:
1104 error = copyin((caddr_t)args->arg, &linux_flock,
1105 sizeof(linux_flock));
1106 if (error)
1107 return (error);
1108 linux_to_bsd_flock64(&linux_flock, bsd_flock);
1109 fcntl_args.fd = args->fd;
1110 fcntl_args.cmd = F_GETLK;
1111 fcntl_args.arg = (long)bsd_flock;
1112 error = fcntl(td, &fcntl_args);
1113 if (error)
1114 return (error);
1115 bsd_to_linux_flock64(bsd_flock, &linux_flock);
1116 return (copyout(&linux_flock, (caddr_t)args->arg,
1117 sizeof(linux_flock)));
1118
1119 case LINUX_F_SETLK:
1120 case LINUX_F_SETLK64:
1122 error = copyin((caddr_t)args->arg, &linux_flock,
1123 sizeof(linux_flock));
1124 if (error)
1125 return (error);
1126 linux_to_bsd_flock64(&linux_flock, bsd_flock);
1127 fcntl_args.fd = args->fd;
1128 fcntl_args.cmd = F_SETLK;
1129 fcntl_args.arg = (long)bsd_flock;
1130 return (fcntl(td, &fcntl_args));
1131
1132 case LINUX_F_SETLKW:
1121 error = copyin((caddr_t)args->arg, &linux_flock,
1122 sizeof(linux_flock));
1123 if (error)
1124 return (error);
1125 linux_to_bsd_flock64(&linux_flock, bsd_flock);
1126 fcntl_args.fd = args->fd;
1127 fcntl_args.cmd = F_SETLK;
1128 fcntl_args.arg = (long)bsd_flock;
1129 return (fcntl(td, &fcntl_args));
1130
1131 case LINUX_F_SETLKW:
1132 case LINUX_F_SETLKW64:
1133 error = copyin((caddr_t)args->arg, &linux_flock,
1134 sizeof(linux_flock));
1135 if (error)
1136 return (error);
1137 linux_to_bsd_flock64(&linux_flock, bsd_flock);
1138 fcntl_args.fd = args->fd;
1139 fcntl_args.cmd = F_SETLKW;
1140 fcntl_args.arg = (long)bsd_flock;

--- 48 unchanged lines hidden --- 		1133 error = copyin((caddr_t)args->arg, &linux_flock,
1134 sizeof(linux_flock));
1135 if (error)
1136 return (error);
1137 linux_to_bsd_flock64(&linux_flock, bsd_flock);
1138 fcntl_args.fd = args->fd;
1139 fcntl_args.cmd = F_SETLKW;
1140 fcntl_args.arg = (long)bsd_flock;

--- 48 unchanged lines hidden ---