From owner-freebsd-current@FreeBSD.ORG  Mon Mar 28 10:19:11 2011
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9DCA11065670
	for <freebsd-current@freebsd.org>; Mon, 28 Mar 2011 10:19:11 +0000 (UTC)
	(envelope-from ray@dlink.ua)
Received: from dlink.ua (smtp.dlink.ua [193.138.187.146])
	by mx1.freebsd.org (Postfix) with ESMTP id 58E8F8FC0C
	for <freebsd-current@freebsd.org>; Mon, 28 Mar 2011 10:19:10 +0000 (UTC)
Received: from gw-lan1.kiev.dlink.ua ([192.168.10.10] helo=terran.dlink.ua)
	by dlink.ua with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.63) (envelope-from <ray@dlink.ua>) id 1Q49XQ-0002PK-5n
	for freebsd-current@freebsd.org; Mon, 28 Mar 2011 13:19:08 +0300
Date: Mon, 28 Mar 2011 13:19:03 +0300
From: Aleksandr Rybalko <ray@dlink.ua>
To: "freebsd-current@freebsd.org" <freebsd-current@freebsd.org>
Message-Id: <20110328131903.6bf2bc62.ray@dlink.ua>
Organization: D-Link
X-Mailer: Sylpheed 2.7.1 (GTK+ 2.20.1; i386-portbld-freebsd8.0)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Fix softdep_request_cleanup difference w/ and w/o SOFTUPDATES
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Mar 2011 10:19:11 -0000

Hi,

I found a difference of definition softdep_request_cleanup.
when SOFTUPDATES undefined softdep_request_cleanup take only two arguments. 

Patch to fix this:

Index: sys/ufs/ffs/ffs_softdep.c
===================================================================
--- sys/ufs/ffs/ffs_softdep.c	(revision 220095)
+++ sys/ufs/ffs/ffs_softdep.c	(working copy)
@@ -514,9 +514,10 @@
 }
 
 int
-softdep_request_cleanup(fs, vp)
+softdep_request_cleanup(fs, vp, resource)
 	struct fs *fs;
 	struct vnode *vp;
+	int resource;
 {
 
 	return (0);

-- 
Alexandr Rybalko <ray@dlink.ua> 
aka Alex RAY <ray@ddteam.net>