Module Name: src
Committed By: pooka
Date: Sun Apr 26 21:30:43 UTC 2009
Modified Files:
src/sys/rump/librump/rumpuser: rumpuser.c
Log Message:
Don't drop kernel lock twice inside same operation.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/rump/librump/rumpuser/rumpuser.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/rump/librump/rumpuser/rumpuser.c
diff -u src/sys/rump/librump/rumpuser/rumpuser.c:1.39 src/sys/rump/librump/rumpuser/rumpuser.c:1.40
--- src/sys/rump/librump/rumpuser/rumpuser.c:1.39 Fri Apr 17 00:39:26 2009
+++ src/sys/rump/librump/rumpuser/rumpuser.c Sun Apr 26 21:30:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.39 2009/04/17 00:39:26 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.40 2009/04/26 21:30:43 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser.c,v 1.39 2009/04/17 00:39:26 pooka Exp $");
+__RCSID("$NetBSD: rumpuser.c,v 1.40 2009/04/26 21:30:43 pooka Exp $");
#endif /* !lint */
/* thank the maker for this */
@@ -278,7 +278,7 @@
ssize_t rv;
int error = 0;
- KLOCK_WRAP(rv = rumpuser_pread(fd, data, size, offset, &error));
+ rv = rumpuser_pread(fd, data, size, offset, &error);
/* check against <0 instead of ==-1 to get typing below right */
if (rv < 0)
rv = 0;
@@ -318,7 +318,7 @@
ssize_t rv;
int error = 0;
- KLOCK_WRAP(rv = rumpuser_pwrite(fd, data, size, offset, &error));
+ rv = rumpuser_pwrite(fd, data, size, offset, &error);
/* check against <0 instead of ==-1 to get typing below right */
if (rv < 0)
rv = 0;
