Deleted Added
full compact
linux_file.c (111119) linux_file.c (111797)
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 111119 2003-02-19 05:47:46Z imp $
28 * $FreeBSD: head/sys/compat/linux/linux_file.c 111797 2003-03-03 09:14:26Z des $
29 */
30
31#include "opt_compat.h"
32#include "opt_mac.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/conf.h>

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

186
187 bsd_args.fd = args->fd;
188 bsd_args.offset = off;
189 bsd_args.whence = args->whence;
190
191 if ((error = lseek(td, &bsd_args)))
192 return error;
193
29 */
30
31#include "opt_compat.h"
32#include "opt_mac.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/conf.h>

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

186
187 bsd_args.fd = args->fd;
188 bsd_args.offset = off;
189 bsd_args.whence = args->whence;
190
191 if ((error = lseek(td, &bsd_args)))
192 return error;
193
194 if ((error = copyout(td->td_retval, (caddr_t)args->res, sizeof (off_t))))
194 if ((error = copyout(td->td_retval, args->res, sizeof (off_t))))
195 return error;
196
197 td->td_retval[0] = 0;
198 return 0;
199}
200#endif /*!__alpha__*/
201
202#ifndef __alpha__

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

975 arg |= O_APPEND;
976 if (args->arg & LINUX_O_SYNC)
977 arg |= O_FSYNC;
978 if (args->arg & LINUX_FASYNC)
979 arg |= O_ASYNC;
980 return (kern_fcntl(td, args->fd, F_SETFL, arg));
981
982 case LINUX_F_GETLK:
195 return error;
196
197 td->td_retval[0] = 0;
198 return 0;
199}
200#endif /*!__alpha__*/
201
202#ifndef __alpha__

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

975 arg |= O_APPEND;
976 if (args->arg & LINUX_O_SYNC)
977 arg |= O_FSYNC;
978 if (args->arg & LINUX_FASYNC)
979 arg |= O_ASYNC;
980 return (kern_fcntl(td, args->fd, F_SETFL, arg));
981
982 case LINUX_F_GETLK:
983 error = copyin((caddr_t)args->arg, &linux_flock,
983 error = copyin((void *)args->arg, &linux_flock,
984 sizeof(linux_flock));
985 if (error)
986 return (error);
987 linux_to_bsd_flock(&linux_flock, &bsd_flock);
988 error = kern_fcntl(td, args->fd, F_GETLK, (intptr_t)&bsd_flock);
989 if (error)
990 return (error);
991 bsd_to_linux_flock(&bsd_flock, &linux_flock);
984 sizeof(linux_flock));
985 if (error)
986 return (error);
987 linux_to_bsd_flock(&linux_flock, &bsd_flock);
988 error = kern_fcntl(td, args->fd, F_GETLK, (intptr_t)&bsd_flock);
989 if (error)
990 return (error);
991 bsd_to_linux_flock(&bsd_flock, &linux_flock);
992 return (copyout(&linux_flock, (caddr_t)args->arg,
992 return (copyout(&linux_flock, (void *)args->arg,
993 sizeof(linux_flock)));
994
995 case LINUX_F_SETLK:
993 sizeof(linux_flock)));
994
995 case LINUX_F_SETLK:
996 error = copyin((caddr_t)args->arg, &linux_flock,
996 error = copyin((void *)args->arg, &linux_flock,
997 sizeof(linux_flock));
998 if (error)
999 return (error);
1000 linux_to_bsd_flock(&linux_flock, &bsd_flock);
1001 return (kern_fcntl(td, args->fd, F_SETLK,
1002 (intptr_t)&bsd_flock));
1003
1004 case LINUX_F_SETLKW:
997 sizeof(linux_flock));
998 if (error)
999 return (error);
1000 linux_to_bsd_flock(&linux_flock, &bsd_flock);
1001 return (kern_fcntl(td, args->fd, F_SETLK,
1002 (intptr_t)&bsd_flock));
1003
1004 case LINUX_F_SETLKW:
1005 error = copyin((caddr_t)args->arg, &linux_flock,
1005 error = copyin((void *)args->arg, &linux_flock,
1006 sizeof(linux_flock));
1007 if (error)
1008 return (error);
1009 linux_to_bsd_flock(&linux_flock, &bsd_flock);
1010 return (kern_fcntl(td, args->fd, F_SETLKW,
1011 (intptr_t)&bsd_flock));
1012
1013 case LINUX_F_GETOWN:

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

1060
1061#ifdef DEBUG
1062 if (ldebug(fcntl64))
1063 printf(ARGS(fcntl64, "%d, %08x, *"), args->fd, args->cmd);
1064#endif
1065
1066 switch (args->cmd) {
1067 case LINUX_F_GETLK64:
1006 sizeof(linux_flock));
1007 if (error)
1008 return (error);
1009 linux_to_bsd_flock(&linux_flock, &bsd_flock);
1010 return (kern_fcntl(td, args->fd, F_SETLKW,
1011 (intptr_t)&bsd_flock));
1012
1013 case LINUX_F_GETOWN:

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

1060
1061#ifdef DEBUG
1062 if (ldebug(fcntl64))
1063 printf(ARGS(fcntl64, "%d, %08x, *"), args->fd, args->cmd);
1064#endif
1065
1066 switch (args->cmd) {
1067 case LINUX_F_GETLK64:
1068 error = copyin((caddr_t)args->arg, &linux_flock,
1068 error = copyin((void *)args->arg, &linux_flock,
1069 sizeof(linux_flock));
1070 if (error)
1071 return (error);
1072 linux_to_bsd_flock64(&linux_flock, &bsd_flock);
1073 error = kern_fcntl(td, args->fd, F_GETLK, (intptr_t)&bsd_flock);
1074 if (error)
1075 return (error);
1076 bsd_to_linux_flock64(&bsd_flock, &linux_flock);
1069 sizeof(linux_flock));
1070 if (error)
1071 return (error);
1072 linux_to_bsd_flock64(&linux_flock, &bsd_flock);
1073 error = kern_fcntl(td, args->fd, F_GETLK, (intptr_t)&bsd_flock);
1074 if (error)
1075 return (error);
1076 bsd_to_linux_flock64(&bsd_flock, &linux_flock);
1077 return (copyout(&linux_flock, (caddr_t)args->arg,
1078 sizeof(linux_flock)));
1077 return (copyout(&linux_flock, (void *)args->arg,
1078 sizeof(linux_flock)));
1079
1080 case LINUX_F_SETLK64:
1079
1080 case LINUX_F_SETLK64:
1081 error = copyin((caddr_t)args->arg, &linux_flock,
1081 error = copyin((void *)args->arg, &linux_flock,
1082 sizeof(linux_flock));
1083 if (error)
1084 return (error);
1085 linux_to_bsd_flock64(&linux_flock, &bsd_flock);
1086 return (kern_fcntl(td, args->fd, F_SETLK,
1087 (intptr_t)&bsd_flock));
1088
1089 case LINUX_F_SETLKW64:
1082 sizeof(linux_flock));
1083 if (error)
1084 return (error);
1085 linux_to_bsd_flock64(&linux_flock, &bsd_flock);
1086 return (kern_fcntl(td, args->fd, F_SETLK,
1087 (intptr_t)&bsd_flock));
1088
1089 case LINUX_F_SETLKW64:
1090 error = copyin((caddr_t)args->arg, &linux_flock,
1090 error = copyin((void *)args->arg, &linux_flock,
1091 sizeof(linux_flock));
1092 if (error)
1093 return (error);
1094 linux_to_bsd_flock64(&linux_flock, &bsd_flock);
1095 return (kern_fcntl(td, args->fd, F_SETLKW,
1096 (intptr_t)&bsd_flock));
1097 }
1098

--- 37 unchanged lines hidden ---
1091 sizeof(linux_flock));
1092 if (error)
1093 return (error);
1094 linux_to_bsd_flock64(&linux_flock, &bsd_flock);
1095 return (kern_fcntl(td, args->fd, F_SETLKW,
1096 (intptr_t)&bsd_flock));
1097 }
1098

--- 37 unchanged lines hidden ---