Module Name:    src
Committed By:   martin
Date:           Tue Jan 17 09:30:16 UTC 2012

Modified Files:
        src/sys/fs/puffs: puffs_vnops.c

Log Message:
Add a few KASSERT() - I have a crash that likely will cause one of them to
fire...


To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/sys/fs/puffs/puffs_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/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.162 src/sys/fs/puffs/puffs_vnops.c:1.163
--- src/sys/fs/puffs/puffs_vnops.c:1.162	Fri Nov 18 21:18:50 2011
+++ src/sys/fs/puffs/puffs_vnops.c	Tue Jan 17 09:30:16 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_vnops.c,v 1.162 2011/11/18 21:18:50 christos Exp $	*/
+/*	$NetBSD: puffs_vnops.c,v 1.163 2012/01/17 09:30:16 martin Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.162 2011/11/18 21:18:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.163 2012/01/17 09:30:16 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -1356,11 +1356,16 @@ puffs_vnop_fsync(void *v)
 		off_t a_offhi;
 	} */ *ap = v;
 	PUFFS_MSG_VARS(vn, fsync);
-	struct vnode *vp = ap->a_vp;
-	struct puffs_node *pn = VPTOPP(vp);
-	struct puffs_mount *pmp = MPTOPUFFSMP(vp->v_mount);
+	struct vnode *vp;
+	struct puffs_node *pn;
+	struct puffs_mount *pmp;
 	int error, dofaf;
 
+	vp = ap->a_vp;
+	KASSERT(vp != NULL);
+	pn = VPTOPP(vp);
+	KASSERT(pn != NULL);
+	pmp = MPTOPUFFSMP(vp->v_mount);
 	if (ap->a_flags & FSYNC_WAIT) {
 		mutex_enter(&pn->pn_sizemtx);
 	} else {

Reply via email to