CVS commit: src/sys

[YAMAMOTO Takashi]

Module Name:    src
Committed By:   yamt
Date:           Mon May  4 06:05:19 UTC 2009

Modified Files:
        src/sys/kern: vfs_lookup.c
        src/sys/nfs: nfs_srvsubs.c

Log Message:
when freeing cn_pnbuf, make it NULL if DIAGNOSTIC.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/kern/vfs_lookup.c
cvs rdiff -u -r1.2 -r1.3 src/sys/nfs/nfs_srvsubs.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/kern/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.113 src/sys/kern/vfs_lookup.c:1.114
--- src/sys/kern/vfs_lookup.c:1.113	Wed Feb 11 00:19:11 2009
+++ src/sys/kern/vfs_lookup.c	Mon May  4 06:05:19 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_lookup.c,v 1.113 2009/02/11 00:19:11 enami Exp $	*/
+/*	$NetBSD: vfs_lookup.c,v 1.114 2009/05/04 06:05:19 yamt Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.113 2009/02/11 00:19:11 enami Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.114 2009/05/04 06:05:19 yamt Exp $");
 
 #include "opt_magiclinks.h"
 
@@ -356,10 +356,14 @@
 					vput(ndp->ni_dvp);
 				}
 			}
-			if ((cnp->cn_flags & (SAVENAME | SAVESTART)) == 0)
+			if ((cnp->cn_flags & (SAVENAME | SAVESTART)) == 0) {
 				PNBUF_PUT(cnp->cn_pnbuf);
-			else
+#if defined(DIAGNOSTIC)
+				cnp->cn_pnbuf = NULL;
+#endif /* defined(DIAGNOSTIC) */
+			} else {
 				cnp->cn_flags |= HASBUF;
+			}
 			return (0);
 		}
 

Index: src/sys/nfs/nfs_srvsubs.c
diff -u src/sys/nfs/nfs_srvsubs.c:1.2 src/sys/nfs/nfs_srvsubs.c:1.3
--- src/sys/nfs/nfs_srvsubs.c:1.2	Sat Mar 14 21:04:25 2009
+++ src/sys/nfs/nfs_srvsubs.c	Mon May  4 06:05:19 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_srvsubs.c,v 1.2 2009/03/14 21:04:25 dsl Exp $	*/
+/*	$NetBSD: nfs_srvsubs.c,v 1.3 2009/05/04 06:05:19 yamt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_srvsubs.c,v 1.2 2009/03/14 21:04:25 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_srvsubs.c,v 1.3 2009/05/04 06:05:19 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -284,10 +284,14 @@
 				vput(ndp->ni_dvp);
 			}
 		}
-		if (cnp->cn_flags & (SAVENAME | SAVESTART))
+		if (cnp->cn_flags & (SAVENAME | SAVESTART)) {
 			cnp->cn_flags |= HASBUF;
-		else
+		} else {
 			PNBUF_PUT(cnp->cn_pnbuf);
+#if defined(DIAGNOSTIC)
+			cnp->cn_pnbuf = NULL;
+#endif /* defined(DIAGNOSTIC) */
+		}
 		return (0);
 	} else {
 		if (!pubflag) {