Module Name: src
Committed By: bouyer
Date: Fri May 20 19:28:57 UTC 2011
Modified Files:
src/sys/kern [netbsd-5]: kern_acct.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1618):
sys/kern/kern_acct.c: revision 1.91
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.86 -r1.86.12.1 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.86 src/sys/kern/kern_acct.c:1.86.12.1
--- src/sys/kern/kern_acct.c:1.86 Thu Apr 24 18:39:23 2008
+++ src/sys/kern/kern_acct.c Fri May 20 19:28:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_acct.c,v 1.86 2008/04/24 18:39:23 ad Exp $ */
+/* $NetBSD: kern_acct.c,v 1.86.12.1 2011/05/20 19:28:56 bouyer Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_acct.c,v 1.86 2008/04/24 18:39:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_acct.c,v 1.86.12.1 2011/05/20 19:28:56 bouyer 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:
