Module Name: src
Committed By: hannken
Date: Sun Feb 9 17:18:38 UTC 2014
Modified Files:
src/sys/miscfs/umapfs: umap_vnops.c
Log Message:
Adjust comment and change vput() to vrele(). This change got missed
when changing vnode creation operations to return unlocked result.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/miscfs/umapfs/umap_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/miscfs/umapfs/umap_vnops.c
diff -u src/sys/miscfs/umapfs/umap_vnops.c:1.54 src/sys/miscfs/umapfs/umap_vnops.c:1.55
--- src/sys/miscfs/umapfs/umap_vnops.c:1.54 Fri Feb 7 15:29:22 2014
+++ src/sys/miscfs/umapfs/umap_vnops.c Sun Feb 9 17:18:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umap_vnops.c,v 1.54 2014/02/07 15:29:22 hannken Exp $ */
+/* $NetBSD: umap_vnops.c,v 1.55 2014/02/09 17:18:38 hannken Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umap_vnops.c,v 1.54 2014/02/07 15:29:22 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umap_vnops.c,v 1.55 2014/02/09 17:18:38 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -272,16 +272,14 @@ umap_bypass(void *v)
vppp = VOPARG_OFFSETTO(struct vnode***,
descp->vdesc_vpp_offset, ap);
/*
- * Only vop_lookup, vop_create, vop_makedir, vop_bmap,
- * vop_mknod, and vop_symlink return vpp's. vop_bmap
- * doesn't call bypass as the lower vpp is fine (we're just
- * going to do i/o on it). vop_lookup doesn't call bypass
+ * Only vop_lookup, vop_create, vop_makedir, vop_mknod
+ * and vop_symlink return vpp's. vop_lookup doesn't call bypass
* as a lookup on "." would generate a locking error.
- * So all the calls which get us here have a locked vpp. :-)
+ * So all the calls which get us here have a unlocked vpp. :-)
*/
error = layer_node_create(old_vps[0]->v_mount, **vppp, *vppp);
if (error) {
- vput(**vppp);
+ vrele(**vppp);
**vppp = NULL;
}
}
