summaryrefslogtreecommitdiff
path: root/sys/dev/vnd.c
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2008-03-21 21:54:58 +0000
committerad <ad@NetBSD.org>2008-03-21 21:54:58 +0000
commita9ca7a3734751f09c9dc4e1f645cd528fd403e8c (patch)
treeff26aca94a1a611e6be984fcff411406b466507f /sys/dev/vnd.c
parentc743ad71591a886accf44c9e93c1ff677b45a41f (diff)
Catch up with descriptor handling changes. See kern_descrip.c revision
1.173 for details.
Diffstat (limited to 'sys/dev/vnd.c')
-rw-r--r--sys/dev/vnd.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 3551e893fc0..57e5888c955 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,7 +1,7 @@
-/* $NetBSD: vnd.c,v 1.176 2008/03/04 23:03:29 cube Exp $ */
+/* $NetBSD: vnd.c,v 1.177 2008/03/21 21:54:59 ad Exp $ */
/*-
- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -137,7 +137,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.176 2008/03/04 23:03:29 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.177 2008/03/21 21:54:59 ad Exp $");
#if defined(_KERNEL_OPT)
#include "fs_nfs.h"
@@ -1215,7 +1215,7 @@ vndioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
break;
close_and_exit:
- (void) vn_close(nd.ni_vp, fflags, l->l_cred, l);
+ (void) vn_close(nd.ni_vp, fflags, l->l_cred);
unlock_and_exit:
#ifdef VND_COMPRESSION
/* free any allocated memory (for compressed file) */
@@ -1493,7 +1493,6 @@ static void
vndclear(struct vnd_softc *vnd, int myminor)
{
struct vnode *vp = vnd->sc_vp;
- struct lwp *l = curlwp;
int fflags = FREAD;
int bmaj, cmaj, i, mn;
int s;
@@ -1548,7 +1547,7 @@ vndclear(struct vnd_softc *vnd, int myminor)
| VNF_VUNCONF | VNF_COMP);
if (vp == (struct vnode *)0)
panic("vndclear: null vp");
- (void) vn_close(vp, fflags, vnd->sc_cred, l);
+ (void) vn_close(vp, fflags, vnd->sc_cred);
kauth_cred_free(vnd->sc_cred);
vnd->sc_vp = (struct vnode *)0;
vnd->sc_cred = (kauth_cred_t)0;