Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/ufs/lfs ... actually, define compat only for the kernel....
details: https://anonhg.NetBSD.org/src/rev/5afd43eef14e
branches: trunk
changeset: 748799:5afd43eef14e
user: pooka <pooka%NetBSD.org@localhost>
date: Thu Nov 05 17:16:36 2009 +0000
description:
... actually, define compat only for the kernel. Userlandia should
see only one version of the interfaces.
diffstat:
sys/ufs/lfs/lfs.h | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diffs (41 lines):
diff -r ff32238bfa3d -r 5afd43eef14e sys/ufs/lfs/lfs.h
--- a/sys/ufs/lfs/lfs.h Thu Nov 05 16:59:55 2009 +0000
+++ b/sys/ufs/lfs/lfs.h Thu Nov 05 17:16:36 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.h,v 1.131 2009/11/05 16:59:55 pooka Exp $ */
+/* $NetBSD: lfs.h,v 1.132 2009/11/05 17:16:36 pooka Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -67,8 +67,6 @@
#include <sys/queue.h>
#include <sys/condvar.h>
-#include <compat/sys/time_types.h>
-
/*
* Compile-time options for LFS.
*/
@@ -1103,7 +1101,13 @@
# define LFS_WRAP_WAITING 0x1
#define LFCNWRAPSTATUS _FCNW_FSPRIV('L', 13, int)
-/* Compat */
+/*
+ * Compat. Defined for kernel only. Userland always uses
+ * "the one true version".
+ */
+#ifdef _KERNEL
+#include <compat/sys/time_types.h>
+
#define LFCNSEGWAITALL_COMPAT _FCNW_FSPRIV('L', 0, struct timeval50)
#define LFCNSEGWAIT_COMPAT _FCNW_FSPRIV('L', 1, struct timeval50)
#define LFCNIFILEFH_COMPAT _FCNW_FSPRIV('L', 5, struct lfs_fhandle)
@@ -1112,6 +1116,7 @@
#define LFCNWRAPGO_COMPAT _FCNO_FSPRIV('L', 10)
#define LFCNSEGWAITALL_COMPAT_50 _FCNR_FSPRIV('L', 0, struct timeval50)
#define LFCNSEGWAIT_COMPAT_50 _FCNR_FSPRIV('L', 1, struct timeval50)
+#endif
#ifdef _KERNEL
/* XXX MP */
Home |
Main Index |
Thread Index |
Old Index