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

Fix the build that was broken by struct lwp *updateproc reference in 

RUMP-visible code. Instead of checking that updateproc (aka ioflush,
aka syncer) will not sleep in PUFFS code, I check for any kernel thread:
after all none of them are designed to hang awaiting for a remote filesystem
operation to complete.
This commit is contained in:
manu 2011-09-23 01:57:32 +00:00
parent eae1c5542c
commit 38de55a5dd
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/fs/puffs/puffs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: puffs_vnops.c,v 1.156 2011/09/21 15:36:33 manu Exp $ */
/* $NetBSD: puffs_vnops.c,v 1.157 2011/09/23 01:57:32 manu 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.156 2011/09/21 15:36:33 manu Exp $");
__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.157 2011/09/23 01:57:32 manu Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@ -50,8 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.156 2011/09/21 15:36:33 manu Exp $
#include <miscfs/genfs/genfs.h>
#include <miscfs/specfs/specdev.h>
extern struct lwp *updateproc;
int puffs_vnop_lookup(void *);
int puffs_vnop_create(void *);
int puffs_vnop_access(void *);
@ -1360,11 +1358,11 @@ puffs_vnop_fsync(void *v)
int error, dofaf;
/*
* Make sure ioflush does not get stuck in low
* memory conditions: it should not wait for the
* mutex.
* Make sure kernel threads such as ioflush do not get
* stuck in low memory conditions: they should not wait
* for the mutex.
*/
if (curlwp == updateproc)
if (curlwp->l_flag & LW_SYSTEM)
KASSERT((ap->a_flags & FSYNC_WAIT) == 0);
if (ap->a_flags & FSYNC_WAIT) {
@ -2281,7 +2279,7 @@ puffs_vnop_strategy(void *v)
/* allocate transport structure */
tomove = PUFFS_TOMOVE(bp->b_bcount, pmp);
argsize = sizeof(struct puffs_vnmsg_rw);
cansleep = (dofaf || (curlwp == updateproc)) ? 0 : 1;
cansleep = (dofaf || (curlwp->l_flag & LW_SYSTEM)) ? 0 : 1;
error = puffs_msgmem_alloc(argsize + tomove, &park_rw,
(void *)&rw_msg, cansleep);
if (error)

8
sys/miscfs/syncfs/sync_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sync_subr.c,v 1.46 2011/09/22 21:58:07 christos Exp $ */
/* $NetBSD: sync_subr.c,v 1.47 2011/09/23 01:57:32 manu Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sync_subr.c,v 1.46 2011/09/22 21:58:07 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: sync_subr.c,v 1.47 2011/09/23 01:57:32 manu Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -129,8 +129,6 @@ static int syncer_delayno = 0;
static long syncer_last;
static synclist_t * syncer_workitem_pending;
struct lwp * updateproc;
void
vn_initialize_syncerd(void)
{
@ -222,8 +220,6 @@ sched_sync(void *arg)
time_t starttime;
bool synced;
updateproc = curlwp;
for (;;) {
mutex_enter(&syncer_mutex);
mutex_enter(&syncer_data_lock);