From owner-freebsd-bugs@FreeBSD.ORG  Sat Mar  6 00:46:47 2004
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8603716A4CE; Sat,  6 Mar 2004 00:46:47 -0800 (PST)
Received: from mailbox.univie.ac.at (mail.univie.ac.at [131.130.1.27])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 0237243D1D; Sat,  6 Mar 2004 00:46:47 -0800 (PST)
	(envelope-from le@FreeBSD.org)
Received: from wireless (adslle.cc.univie.ac.at [131.130.102.11])
	i268kcsC1293882;	Sat, 6 Mar 2004 09:46:41 +0100
Date: Sat, 6 Mar 2004 09:46:34 +0100 (CET)
From: Lukas Ertl <le@FreeBSD.org>
To: Kris Kennaway <kris@obsecurity.org>
In-Reply-To: <20040306084156.GA28164@xor.obsecurity.org>
Message-ID: <20040306094559.F614@korben.in.tern>
References: <200403051548.i25Fmmsa073994@freefall.freebsd.org>
 <20040306084156.GA28164@xor.obsecurity.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-DCC-ZID-Univie-Metrics: mailbox 4246; Body=0 Fuz1=0 Fuz2=0
cc: freebsd-bugs@FreeBSD.org
cc: pjd@FreeBSD.org
Subject: Re: bin/62536: df gives insane numbers when using root-reserved
 space
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Mar 2004 08:46:47 -0000

On Sat, 6 Mar 2004, Kris Kennaway wrote:

> On Fri, Mar 05, 2004 at 07:48:48AM -0800, Lukas Ertl wrote:
> > Synopsis: df gives insane numbers when using root-reserved space
> >
> > Responsible-Changed-From-To: freebsd-bugs->le
> > Responsible-Changed-By: le
> > Responsible-Changed-When: Fri Mar 5 07:48:22 PST 2004
> > Responsible-Changed-Why:
> > I probably have a fix for this.
>
> pjd has a patch for this as well..I haven't yet tested it.

Ah, good.

My patch looks like this:

---8<---
Index: bin/df/df.c
===================================================================
RCS file: /home/ncvs/src/bin/df/df.c,v
retrieving revision 1.55
diff -u -r1.55 df.c
--- bin/df/df.c	5 Mar 2004 08:10:16 -0000	1.55
+++ bin/df/df.c	5 Mar 2004 15:51:00 -0000
@@ -400,7 +400,8 @@
  */
 #define fsbtoblk(num, fsbs, bs) \
 	(((fsbs) != 0 && (fsbs) < (bs)) ? \
-		(num) / ((bs) / (fsbs)) : (num) * ((fsbs) / (bs)))
+		(num) / (int64_t)((bs) / (fsbs)) : \
+		(num) * (int64_t)((fsbs) / (bs)))

 /*
  * Print out status about a file system.
---8<---

cheers,
le

-- 
Lukas Ertl                           http://mailbox.univie.ac.at/~le/
le@FreeBSD.org                       http://people.freebsd.org/~le/