Module Name: src
Committed By: riz
Date: Fri Jul 16 18:31:59 UTC 2010
Modified Files:
src/sys/nfs [netbsd-5]: nfs_bio.c
Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #1417):
sys/nfs/nfs_bio.c: revision 1.185
Fix memory leak during some NFS writes.
To generate a diff of this commit:
cvs rdiff -u -r1.179.4.1 -r1.179.4.2 src/sys/nfs/nfs_bio.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/nfs/nfs_bio.c
diff -u src/sys/nfs/nfs_bio.c:1.179.4.1 src/sys/nfs/nfs_bio.c:1.179.4.2
--- src/sys/nfs/nfs_bio.c:1.179.4.1 Sun Nov 2 23:08:56 2008
+++ src/sys/nfs/nfs_bio.c Fri Jul 16 18:31:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_bio.c,v 1.179.4.1 2008/11/02 23:08:56 snj Exp $ */
+/* $NetBSD: nfs_bio.c,v 1.179.4.2 2010/07/16 18:31:59 riz Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.179.4.1 2008/11/02 23:08:56 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.179.4.2 2010/07/16 18:31:59 riz Exp $");
#include "opt_nfs.h"
#include "opt_ddb.h"
@@ -1045,7 +1045,7 @@
pgs[i]->flags &= ~(PG_NEEDCOMMIT | PG_RDONLY);
}
mutex_exit(&uobj->vmobjlock);
- return 0;
+ goto out;
} else if (error == NFSERR_STALEWRITEVERF) {
nfs_clearcommit(vp->v_mount);
goto again;
