Module Name: src
Committed By: bouyer
Date: Sun Feb 5 12:30:13 UTC 2012
Modified Files:
src/sys/kern [netbsd-5]: vfs_bio.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #1718):
sys/kern/vfs_bio.c: revision 1.233
sysctl_dobuf: re-acquire the sysctl lock on retry path. PR/45827.
To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.210.4.1 src/sys/kern/vfs_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/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.210 src/sys/kern/vfs_bio.c:1.210.4.1
--- src/sys/kern/vfs_bio.c:1.210 Thu Sep 11 09:14:46 2008
+++ src/sys/kern/vfs_bio.c Sun Feb 5 12:30:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.210 2008/09/11 09:14:46 hannken Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.210.4.1 2012/02/05 12:30:13 bouyer Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -109,7 +109,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.210 2008/09/11 09:14:46 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.210.4.1 2012/02/05 12:30:13 bouyer Exp $");
#include "fs_ffs.h"
#include "opt_bufcache.h"
@@ -1788,6 +1788,7 @@ sysctl_dobuf(SYSCTLFN_ARGS)
break;
}
mutex_exit(&bufcache_lock);
+ sysctl_relock();
goto retry;
}
dp += elem_size;
