CVS commit: [rmind-uvmplock] src/sys/fs/tmpfs

[Mindaugas Rasiukevicius]

Module Name:    src
Committed By:   rmind
Date:           Tue May 31 01:51:58 UTC 2011

Modified Files:
        src/sys/fs/tmpfs [rmind-uvmplock]: tmpfs_subr.c

Log Message:
tmpfs_alloc_vp: perform lock sharing only for VREG.


To generate a diff of this commit:
cvs rdiff -u -r1.56.4.7 -r1.56.4.8 src/sys/fs/tmpfs/tmpfs_subr.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_subr.c
diff -u src/sys/fs/tmpfs/tmpfs_subr.c:1.56.4.7 src/sys/fs/tmpfs/tmpfs_subr.c:1.56.4.8
--- src/sys/fs/tmpfs/tmpfs_subr.c:1.56.4.7	Mon May 30 14:57:48 2011
+++ src/sys/fs/tmpfs/tmpfs_subr.c	Tue May 31 01:51:58 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: tmpfs_subr.c,v 1.56.4.7 2011/05/30 14:57:48 rmind Exp $	*/
+/*	$NetBSD: tmpfs_subr.c,v 1.56.4.8 2011/05/31 01:51:58 rmind Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.56.4.7 2011/05/30 14:57:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.56.4.8 2011/05/31 01:51:58 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/dirent.h>
@@ -344,7 +344,7 @@
 int
 tmpfs_alloc_vp(struct mount *mp, struct tmpfs_node *node, struct vnode **vpp)
 {
-	struct uvm_object *uobj;
+	kmutex_t *slock;
 	int error;
 	struct vnode *vp;
 
@@ -367,16 +367,19 @@
 
 	/*
 	 * Get a new vnode and associate it with our inode.  Share the
-	 * lock with underlying UVM object.
+	 * lock with underlying UVM object, if there is one (VREG case).
 	 */
-	uobj = node->tn_spec.tn_reg.tn_aobj;
-	error = getnewvnode(VT_TMPFS, mp, tmpfs_vnodeop_p,
-	    uobj->vmobjlock, &vp);
+	if (node->tn_type == VREG) {
+		struct uvm_object *uobj = node->tn_spec.tn_reg.tn_aobj;
+		slock = uobj->vmobjlock;
+	} else {
+		slock = NULL;
+	}
+	error = getnewvnode(VT_TMPFS, mp, tmpfs_vnodeop_p, slock, &vp);
 	if (error != 0) {
 		mutex_exit(&node->tn_vlock);
 		return error;
 	}
-	KASSERT(uobj->vmobjlock == vp->v_interlock);
 
 	error = vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	if (error != 0) {