Module Name: src Committed By: dholland Date: Sat Mar 26 21:31:23 UTC 2011
Modified Files: src/sys/kern: kern_acct.c Log Message: Fix up sign-compare issue checking for free space. Should fix PR 43413 where accounting doesn't suspend properly. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/kern/kern_acct.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/kern_acct.c diff -u src/sys/kern/kern_acct.c:1.90 src/sys/kern/kern_acct.c:1.91 --- src/sys/kern/kern_acct.c:1.90 Fri Nov 19 06:44:42 2010 +++ src/sys/kern/kern_acct.c Sat Mar 26 21:31:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_acct.c,v 1.90 2010/11/19 06:44:42 dholland Exp $ */ +/* $NetBSD: kern_acct.c,v 1.91 2011/03/26 21:31:23 dholland Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_acct.c,v 1.90 2010/11/19 06:44:42 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_acct.c,v 1.91 2011/03/26 21:31:23 dholland Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -174,7 +174,7 @@ { int error; struct statvfs *sb; - int64_t bavail; + fsblkcnt_t bavail; sb = kmem_alloc(sizeof(*sb), KM_SLEEP); if (sb == NULL) @@ -185,7 +185,11 @@ return (error); } - bavail = sb->f_bfree - sb->f_bresvd; + if (sb->f_bfree < sb->f_bresvd) { + bavail = 0; + } else { + bavail = sb->f_bfree - sb->f_bresvd; + } switch (acct_state) { case ACCT_SUSPENDED: