Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change previous patch to have same effect as patch posted to 

tech-kern. Suggested reformatting inadvertently changed the meaning of
the code, as noted by YAMAMOTO Takashi <yamt@mwd.biglobe.ne.jp>.
This commit is contained in:
jonathan 2003-11-17 01:44:49 +00:00
parent 6ddd119256
commit cc1346b1a2
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/nfs/nfs_bio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_bio.c,v 1.111 2003/11/17 00:28:32 jonathan Exp $ */ /* $NetBSD: nfs_bio.c,v 1.112 2003/11/17 01:44:49 jonathan Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -35,7 +35,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.111 2003/11/17 00:28:32 jonathan Exp $"); __KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.112 2003/11/17 01:44:49 jonathan Exp $");
#include "opt_nfs.h" #include "opt_nfs.h"
#include "opt_ddb.h" #include "opt_ddb.h"
@ -845,13 +845,15 @@ again:
* XXX: start non-loopback mounts straight away? If "lots free", * XXX: start non-loopback mounts straight away? If "lots free",
* let pagedaemon start loopback writes anyway? * let pagedaemon start loopback writes anyway?
*/ */
if (gotiod && (curproc != uvm.pagedaemon_proc)) { if (gotiod) {
/* /*
* Ensure that the queue never grows too large. * Ensure that the queue never grows too large.
*/ */
if (curproc == uvm.pagedaemon_proc)) {
while (nmp->nm_bufqlen >= 2*nfs_numasync) { /* Enque for later, to avoid free-page deadlock */
(void) 0;
} else while (nmp->nm_bufqlen >= 2*nfs_numasync) {
nmp->nm_bufqwant = TRUE; nmp->nm_bufqwant = TRUE;
error = ltsleep(&nmp->nm_bufq, error = ltsleep(&nmp->nm_bufq,
slpflag | PRIBIO | PNORELOCK, slpflag | PRIBIO | PNORELOCK,