From owner-freebsd-current@FreeBSD.ORG  Mon Mar 28 15:32:14 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 C61E6106566B
	for <freebsd-current@freebsd.org>; Mon, 28 Mar 2011 15:32:14 +0000 (UTC)
	(envelope-from rysto32@gmail.com)
Received: from mail-ey0-f182.google.com (mail-ey0-f182.google.com
	[209.85.215.182])
	by mx1.freebsd.org (Postfix) with ESMTP id 58B3D8FC17
	for <freebsd-current@freebsd.org>; Mon, 28 Mar 2011 15:32:13 +0000 (UTC)
Received: by eyg7 with SMTP id 7so1310896eyg.13
	for <freebsd-current@freebsd.org>; Mon, 28 Mar 2011 08:32:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:in-reply-to:references:date
	:message-id:subject:from:to:cc:content-type
	:content-transfer-encoding;
	bh=Q3tRyDRC5JECc0BOkYBC1PRpwb7BEpwLoS61VlYQCaw=;
	b=viCxvsADnvifDu9WDALJrvv1cs3dJCVN4vRtbSZVFa4pgSVLzHkoAZuZhAGcF/gaYK
	iqZG5mwK+elptVtv+RiM9iDSHHJZBhwmjjgTj7Ti8DjbBJr2nE6/e2m9nVbOYgRItgjm
	aRQg4mX4JnMJKivKKtt2gfKhE6z6ZzXZ/+058=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:cc:content-type:content-transfer-encoding;
	b=lUX72Rp6GXZQ4RfwqiFHDOxXGAin/1XQlI1oloAJTPh43jbqwXXdEzN9CirBOrDiFp
	n2jFajRXad9vFwCrbDavf2Jt3a+7YKR8/TQHf8L42lhX0yHbwCDP0N2cwXpvksbJmlDc
	VEr2YrUbngc6eZcme5Qe0qohk5bSXPOWCvfGU=
MIME-Version: 1.0
Received: by 10.213.22.135 with SMTP id n7mr1327084ebb.61.1301326332986; Mon,
	28 Mar 2011 08:32:12 -0700 (PDT)
Received: by 10.213.29.145 with HTTP; Mon, 28 Mar 2011 08:32:12 -0700 (PDT)
In-Reply-To: <20110328131903.6bf2bc62.ray@dlink.ua>
References: <20110328131903.6bf2bc62.ray@dlink.ua>
Date: Mon, 28 Mar 2011 11:32:12 -0400
Message-ID: <AANLkTinB20FEPrDrc4G6+se_hmyKpzCAe5_9JHa0FH2N@mail.gmail.com>
From: Ryan Stone <rysto32@gmail.com>
To: Aleksandr Rybalko <ray@dlink.ua>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: "freebsd-current@freebsd.org" <freebsd-current@freebsd.org>
Subject: Re: 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 15:32:14 -0000

On Mon, Mar 28, 2011 at 6:19 AM, Aleksandr Rybalko <ray@dlink.ua> wrote:
> Hi,
>
> I found a difference of definition softdep_request_cleanup.
> when SOFTUPDATES undefined softdep_request_cleanup take only two argument=
s.
>
> Patch to fix this:
>
> Index: sys/ufs/ffs/ffs_softdep.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- sys/ufs/ffs/ffs_softdep.c =A0 (revision 220095)
> +++ sys/ufs/ffs/ffs_softdep.c =A0 (working copy)
> @@ -514,9 +514,10 @@
> =A0}
>
> =A0int
> -softdep_request_cleanup(fs, vp)
> +softdep_request_cleanup(fs, vp, resource)
> =A0 =A0 =A0 =A0struct fs *fs;
> =A0 =A0 =A0 =A0struct vnode *vp;
> + =A0 =A0 =A0 int resource;
> =A0{
>
> =A0 =A0 =A0 =A0return (0);

If we need to change the definition, shouldn't we convert it to a C89
declaration at the same time?