From owner-p4-projects@FreeBSD.ORG  Fri May  7 07:37:53 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C758B16A4D0; Fri,  7 May 2004 07:37:52 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 946FD16A4CE
	for <perforce@freebsd.org>; Fri,  7 May 2004 07:37:52 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7565343D39
	for <perforce@freebsd.org>; Fri,  7 May 2004 07:37:52 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i47EbqGe047080
	for <perforce@freebsd.org>; Fri, 7 May 2004 07:37:52 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i47EbpHE047077
	for perforce@freebsd.org; Fri, 7 May 2004 07:37:51 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Fri, 7 May 2004 07:37:51 -0700 (PDT)
Message-Id: <200405071437.i47EbpHE047077@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52421 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 May 2004 14:37:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=52421

Change 52421 by peter@peter_daintree on 2004/05/07 07:37:25

	fix mismerge

Affected files ...

.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#13 edit

Differences ...

==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#13 (text+ko) ====

@@ -961,33 +961,6 @@
 #endif
 
 int
-freebsd4_freebsd32_fhstatfs(struct thread *td, struct freebsd4_freebsd32_fhstatfs_args *uap)
-{
-	int error;
-	caddr_t sg;
-	struct statfs32 *p32, s32;
-	struct statfs *p = NULL, s;
-
-	p32 = uap->buf;
-	if (p32) {
-		sg = stackgap_init();
-		p = stackgap_alloc(&sg, sizeof(struct statfs));
-		uap->buf = (struct statfs32 *)p;
-	}
-	error = fhstatfs(td, (struct fhstatfs_args *) uap);
-	if (error)
-		return (error);
-	if (p32) {
-		error = copyin(p, &s, sizeof(s));
-		if (error)
-			return (error);
-		copy_statfs(&s, &s32);
-		error = copyout(&s32, p32, sizeof(s32));
-	}
-	return (error);
-}
-
-int
 freebsd32_semsys(struct thread *td, struct freebsd32_semsys_args *uap)
 {
 	/*