Module Name: src
Committed By: snj
Date: Tue Mar 24 20:22:44 UTC 2009
Modified Files:
src/sys/fs/tmpfs [netbsd-5]: tmpfs_vnops.c
Log Message:
Pull up following revision(s) (requested by pooka in ticket #590):
sys/fs/tmpfs/tmpfs_vnops.c: revision 1.54
Release dvp in mknod error branch.
Nicolas Joly, PR kern/41006
To generate a diff of this commit:
cvs rdiff -u -r1.51.6.1 -r1.51.6.2 src/sys/fs/tmpfs/tmpfs_vnops.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/fs/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.51.6.1 src/sys/fs/tmpfs/tmpfs_vnops.c:1.51.6.2
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.51.6.1 Mon Feb 16 03:29:01 2009
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Tue Mar 24 20:22:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.51.6.1 2009/02/16 03:29:01 snj Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.51.6.2 2009/03/24 20:22:44 snj Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.51.6.1 2009/02/16 03:29:01 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.51.6.2 2009/03/24 20:22:44 snj Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -270,8 +270,10 @@
struct vattr *vap = ((struct vop_mknod_args *)v)->a_vap;
if (vap->va_type != VBLK && vap->va_type != VCHR &&
- vap->va_type != VFIFO)
+ vap->va_type != VFIFO) {
+ vput(dvp);
return EINVAL;
+ }
return tmpfs_alloc_file(dvp, vpp, vap, cnp, NULL);
}