Don't duplicate the LFS_STARVED_FOR_SEGS check (an oversight that came

in with rev 1.210).
This commit is contained in:
perseant 2006-05-18 00:57:13 +00:00
parent 83dc99da2a
commit 758cf626b4
1 changed files with 2 additions and 11 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_vfsops.c,v 1.210 2006/05/14 21:32:45 elad Exp $ */ /* $NetBSD: lfs_vfsops.c,v 1.211 2006/05/18 00:57:13 perseant Exp $ */
/*- /*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc. * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.210 2006/05/14 21:32:45 elad Exp $"); __KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.211 2006/05/18 00:57:13 perseant Exp $");
#if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT)
#include "opt_quota.h" #include "opt_quota.h"
@ -1995,15 +1995,6 @@ lfs_gop_write(struct vnode *vp, struct vm_page **pgs, int npages, int flags)
/* The Ifile lives in the buffer cache */ /* The Ifile lives in the buffer cache */
KASSERT(vp != fs->lfs_ivnode); KASSERT(vp != fs->lfs_ivnode);
/*
* We don't want to fill the disk before the cleaner has a chance
* to make room for us. If we're in danger of doing that, fail
* with EAGAIN. The caller will have to notice this, unlock
* so the cleaner can run, relock and try again.
*/
if (LFS_STARVED_FOR_SEGS(fs))
goto tryagain;
/* /*
* We don't want to fill the disk before the cleaner has a chance * We don't want to fill the disk before the cleaner has a chance
* to make room for us. If we're in danger of doing that, fail * to make room for us. If we're in danger of doing that, fail