From owner-freebsd-current@FreeBSD.ORG Mon Mar 28 18:04:06 2011 Return-Path: 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 5D9C0106567A for ; Mon, 28 Mar 2011 18:04:06 +0000 (UTC) (envelope-from ray@ddteam.net) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id F08F48FC0C for ; Mon, 28 Mar 2011 18:04:05 +0000 (UTC) Received: by fxm11 with SMTP id 11so3678927fxm.13 for ; Mon, 28 Mar 2011 11:04:04 -0700 (PDT) Received: by 10.223.6.11 with SMTP id 11mr742487fax.98.1301335444793; Mon, 28 Mar 2011 11:04:04 -0700 (PDT) Received: from rnote.ddteam.net (185-49-133-95.pool.ukrtel.net [95.133.49.185]) by mx.google.com with ESMTPS id b18sm1618352fak.32.2011.03.28.11.04.02 (version=SSLv3 cipher=OTHER); Mon, 28 Mar 2011 11:04:03 -0700 (PDT) Date: Mon, 28 Mar 2011 21:03:51 +0300 From: Aleksandr Rybalko To: Ryan Stone Message-Id: <20110328210351.f4413f2a.ray@ddteam.net> In-Reply-To: References: <20110328131903.6bf2bc62.ray@dlink.ua> X-Mailer: Sylpheed 3.1.0 (GTK+ 2.22.1; amd64-portbld-freebsd9.0) Mime-Version: 1.0 Content-Type: text/plain; charset=KOI8-U Content-Transfer-Encoding: 8bit Cc: Aleksandr Rybalko , "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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Mar 2011 18:04:06 -0000 On Mon, 28 Mar 2011 11:32:12 -0400 Ryan Stone wrote: > On Mon, Mar 28, 2011 at 6:19 AM, Aleksandr Rybalko > wrote: > > 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); > > If we need to change the definition, shouldn't we convert it to a C89 > declaration at the same time? Yeah, I agree with you, but think peoples who made nice things for UFS have they own plan what to do with this. I only fix problem for building without SOFTUPDATES flag set. BTW, if someone interest I can convert all declaration of this file to C89 :) -- Aleksandr Rybalko