Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src RUMPUSER_OPEN_DIRECT is no longer necessary



details:   https://anonhg.NetBSD.org/src/rev/938ecde16961
branches:  trunk
changeset: 786469:938ecde16961
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Apr 29 13:21:03 2013 +0000

description:
RUMPUSER_OPEN_DIRECT is no longer necessary

diffstat:

 lib/librumpuser/rumpuser.c       |  12 ++----------
 sys/rump/include/rump/rumpuser.h |   5 ++---
 2 files changed, 4 insertions(+), 13 deletions(-)

diffs (52 lines):

diff -r dd46c6f48878 -r 938ecde16961 lib/librumpuser/rumpuser.c
--- a/lib/librumpuser/rumpuser.c        Mon Apr 29 13:19:11 2013 +0000
+++ b/lib/librumpuser/rumpuser.c        Mon Apr 29 13:21:03 2013 +0000
@@ -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 @@
 #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)));
diff -r dd46c6f48878 -r 938ecde16961 sys/rump/include/rump/rumpuser.h
--- a/sys/rump/include/rump/rumpuser.h  Mon Apr 29 13:19:11 2013 +0000
+++ b/sys/rump/include/rump/rumpuser.h  Mon Apr 29 13:21:03 2013 +0000
@@ -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 @@
 #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 *);



Home | Main Index | Thread Index | Old Index