[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] Update to reflect ioctl_handler_t change
From: |
Carl Fredrik Hammar |
Subject: |
[PATCH 2/3] Update to reflect ioctl_handler_t change |
Date: |
Wed, 26 Aug 2009 16:55:57 +0200 |
* ioctl-tests/qioctl-handler.c (hurd_ioctl_handler):
Update to reflect `ioctl_handler_t' change.
---
ioctl-tests/qioctl-handler.c | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ioctl-tests/qioctl-handler.c b/ioctl-tests/qioctl-handler.c
index a5b2503..c56d0a6 100644
--- a/ioctl-tests/qioctl-handler.c
+++ b/ioctl-tests/qioctl-handler.c
@@ -1,15 +1,17 @@
+#include <hurd/ioctl.h>
#include <errno.h>
#include "qio.h"
/* Handle the QOVERRIDE ioctl. */
-int
-hurd_ioctl_handler (int fd, int request)
+error_t
+hurd_ioctl_handler (int fd, struct hurd_fd *d, void *crit,
+ int request, void *arg, int *result)
{
- if (request == QOVERRIDE)
- return 0;
- else
- {
- errno = ENOTTY;
- return -1;
- }
+ if (request != QOVERRIDE)
+ return ENOTTY;
+
+ __spin_unlock (&d->port.lock);
+ _hurd_critical_section_unlock (crit);
+ *result = 0;
+ return 0;
}
--
1.6.3.3
- Re: [PATCH 1/3] Reload fd ioctl handler on each call to ioctl, (continued)
- [PATCH 2/3] Save handlers between calls to ioctl, Carl Fredrik Hammar, 2009/08/26
- [PATCH 3/3] Use reverse authenticating ioctl-handler protocal, Carl Fredrik Hammar, 2009/08/26
- [PATCH 0/3] Test server provided ioctl-handler, Carl Fredrik Hammar, 2009/08/26
- [PATCH 1/3] Test server provided ioctl-handler, Carl Fredrik Hammar, 2009/08/26
- Re: [PATCH 1/3] Test server provided ioctl-handler, olafBuddenhagen, 2009/08/31
- [PATCH 2/3] Update to reflect ioctl_handler_t change,
Carl Fredrik Hammar <=