Module Name: src
Committed By: pooka
Date: Mon Apr 29 13:21:03 UTC 2013
Modified Files:
src/lib/librumpuser: rumpuser.c
src/sys/rump/include/rump: rumpuser.h
Log Message:
RUMPUSER_OPEN_DIRECT is no longer necessary
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/lib/librumpuser/rumpuser.c
cvs rdiff -u -r1.90 -r1.91 src/sys/rump/include/rump/rumpuser.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.39 src/lib/librumpuser/rumpuser.c:1.40
--- src/lib/librumpuser/rumpuser.c:1.39 Mon Apr 29 13:19:11 2013
+++ src/lib/librumpuser/rumpuser.c Mon Apr 29 13:21:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.39 2013/04/29 13:19:11 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.40 2013/04/29 13:21:03 pooka Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser.c,v 1.39 2013/04/29 13:19:11 pooka Exp $");
+__RCSID("$NetBSD: rumpuser.c,v 1.40 2013/04/29 13:21:03 pooka Exp $");
#endif /* !lint */
#include <sys/ioctl.h>
@@ -305,14 +305,6 @@ rumpuser_open(const char *path, int rufl
#define TESTSET(_ru_, _h_) if (ruflags & _ru_) flags |= _h_;
TESTSET(RUMPUSER_OPEN_CREATE, O_CREAT);
TESTSET(RUMPUSER_OPEN_EXCL, O_EXCL);
-#ifdef O_DIRECT
- TESTSET(RUMPUSER_OPEN_DIRECT, O_DIRECT);
-#else
- if (ruflags & RUMPUSER_OPEN_DIRECT) {
- *error = EOPNOTSUPP;
- return -1;
- }
-#endif
#undef TESTSET
DOCALL_KLOCK(int, (open(path, flags, 0644)));
Index: src/sys/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.90 src/sys/rump/include/rump/rumpuser.h:1.91
--- src/sys/rump/include/rump/rumpuser.h:1.90 Mon Apr 29 13:19:11 2013
+++ src/sys/rump/include/rump/rumpuser.h Mon Apr 29 13:21:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.h,v 1.90 2013/04/29 13:19:11 pooka Exp $ */
+/* $NetBSD: rumpuser.h,v 1.91 2013/04/29 13:21:03 pooka Exp $ */
/*
* Copyright (c) 2007-2013 Antti Kantee. All Rights Reserved.
@@ -65,8 +65,7 @@ void rumpuser_unmap(void *, size_t);
#define RUMPUSER_OPEN_ACCMODE 0x0003 /* "yay" */
#define RUMPUSER_OPEN_CREATE 0x0004 /* create file if it doesn't exist */
#define RUMPUSER_OPEN_EXCL 0x0008 /* exclusive open */
-#define RUMPUSER_OPEN_DIRECT 0x0010 /* use direct i/o */
-#define RUMPUSER_OPEN_BIO 0x0020 /* open device for block i/o */
+#define RUMPUSER_OPEN_BIO 0x0010 /* open device for block i/o */
int rumpuser_open(const char *, int, int *);
int rumpuser_close(int, int *);
