Module Name: src
Committed By: njoly
Date: Sun Mar 1 13:19:39 UTC 2015
Modified Files:
src/sys/compat/linux/common: linux_fcntl.h linux_file.c
Log Message:
Add Linux specific fcntl(2) commands. Support F_DUPFD_CLOEXEC.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/compat/linux/common/linux_fcntl.h
cvs rdiff -u -r1.114 -r1.115 src/sys/compat/linux/common/linux_file.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/compat/linux/common/linux_fcntl.h
diff -u src/sys/compat/linux/common/linux_fcntl.h:1.16 src/sys/compat/linux/common/linux_fcntl.h:1.17
--- src/sys/compat/linux/common/linux_fcntl.h:1.16 Sun Jun 1 13:42:12 2014
+++ src/sys/compat/linux/common/linux_fcntl.h Sun Mar 1 13:19:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_fcntl.h,v 1.16 2014/06/01 13:42:12 njoly Exp $ */
+/* $NetBSD: linux_fcntl.h,v 1.17 2015/03/01 13:19:39 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -87,6 +87,16 @@ struct linux_flock64 {
#error Undefined linux_fcntl.h machine type.
#endif
+/* Linux specific fcntl(2) commands */
+#define LINUX_F_SPECIFIC_BASE 1024
+#define LINUX_F_SETLEASE (LINUX_F_SPECIFIC_BASE + 0)
+#define LINUX_F_GETLEASE (LINUX_F_SPECIFIC_BASE + 1)
+#define LINUX_F_NOTIFY (LINUX_F_SPECIFIC_BASE + 2)
+#define LINUX_F_CANCELLK (LINUX_F_SPECIFIC_BASE + 5)
+#define LINUX_F_DUPFD_CLOEXEC (LINUX_F_SPECIFIC_BASE + 6)
+#define LINUX_F_SETPIPE_SZ (LINUX_F_SPECIFIC_BASE + 7)
+#define LINUX_F_GETPIPE_SZ (LINUX_F_SPECIFIC_BASE + 8)
+
/*
* We have to have 4 copies of the code that converts linux fcntl() file
* locking to native form because there are 4 layouts for the structures.
Index: src/sys/compat/linux/common/linux_file.c
diff -u src/sys/compat/linux/common/linux_file.c:1.114 src/sys/compat/linux/common/linux_file.c:1.115
--- src/sys/compat/linux/common/linux_file.c:1.114 Sun Nov 9 17:48:08 2014
+++ src/sys/compat/linux/common/linux_file.c Sun Mar 1 13:19:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_file.c,v 1.114 2014/11/09 17:48:08 maxv Exp $ */
+/* $NetBSD: linux_file.c,v 1.115 2015/03/01 13:19:39 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.114 2014/11/09 17:48:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.115 2015/03/01 13:19:39 njoly Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -417,6 +417,10 @@ linux_sys_fcntl(struct lwp *l, const str
mutex_exit(proc_lock);
return 0;
+ case LINUX_F_DUPFD_CLOEXEC:
+ cmd = F_DUPFD_CLOEXEC;
+ break;
+
default:
return EOPNOTSUPP;
}
