From owner-svn-src-head@FreeBSD.ORG Mon Apr 26 16:57:07 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F3441065670; Mon, 26 Apr 2010 16:57:07 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-bw0-f216.google.com (mail-bw0-f216.google.com [209.85.218.216]) by mx1.freebsd.org (Postfix) with ESMTP id 4BB338FC19; Mon, 26 Apr 2010 16:57:05 +0000 (UTC) Received: by bwz8 with SMTP id 8so11392233bwz.3 for ; Mon, 26 Apr 2010 09:57:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=VL9seA1rH9H4emwMrKXQfRxieqs+p3XVJt9w98ZzjUk=; b=jJ/Ritr/xjg9gXZNZIFDXsQKX1CSz3SUBpcKxEQL0zFGLWQvMvUmm8Sx+ZH0Mk3AYQ q4W01jXif+rRE1UrDVvltrOZDYRBEIDMWU5ZF/kT27481Tc2ModlOnirYAmFQ1IbzYi6 /xRwSkzVZBeKSFYkMuvYl5vzS3WxXSdebo2bM= 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=dyupl8DbfXl7QbJjLeP/MFKALjn+kg9j0l08H1XKXaAfyAUJ8z/2ciNRFEYz1EMCeY WEYnwGtCgJK36iIf2vIG6jyO2eSeb8RC32Ncu7yph6pPvQ6E5BTVNCG045zEzV+Y7uHm cUGcDEeTwguJwtTcX347z6cv5dHEF26n/EAto= MIME-Version: 1.0 Received: by 10.204.30.208 with SMTP id v16mr2785743bkc.187.1272301021354; Mon, 26 Apr 2010 09:57:01 -0700 (PDT) Received: by 10.204.79.3 with HTTP; Mon, 26 Apr 2010 09:57:01 -0700 (PDT) In-Reply-To: <201004240736.o3O7aXVX062189@svn.freebsd.org> References: <201004240736.o3O7aXVX062189@svn.freebsd.org> Date: Mon, 26 Apr 2010 20:57:01 +0400 Message-ID: From: pluknet To: Pawel Jakub Dawidek Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r207142 - head/sys/ufs/ffs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2010 16:57:07 -0000 On 24 April 2010 11:36, Pawel Jakub Dawidek wrote: > Author: pjd > Date: Sat Apr 24 07:36:33 2010 > New Revision: 207142 > URL: http://svn.freebsd.org/changeset/base/207142 > > Log: > =A0Fix build for UFS without SOFTUPDATES. > > Modified: > =A0head/sys/ufs/ffs/ffs_softdep.c > > Modified: head/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=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/ufs/ffs/ffs_softdep.c =A0 =A0 =A0Sat Apr 24 07:05:35 2010 = =A0 =A0 =A0 =A0(r207141) > +++ head/sys/ufs/ffs/ffs_softdep.c =A0 =A0 =A0Sat Apr 24 07:36:33 2010 = =A0 =A0 =A0 =A0(r207142) > @@ -232,7 +232,8 @@ softdep_setup_directory_add(bp, dp, diro > =A0} > > =A0void > -softdep_change_directoryentry_offset(dp, base, oldloc, newloc, entrysize= ) > +softdep_change_directoryentry_offset(bp, dp, base, oldloc, newloc, entry= size) > + =A0 =A0 =A0 struct buf *bp; > =A0 =A0 =A0 =A0struct inode *dp; > =A0 =A0 =A0 =A0caddr_t base; > =A0 =A0 =A0 =A0caddr_t oldloc; make universe still doesn't pass: several arm, mips, powerpc configs (defined without SU) are still broken. The following functions defined only for SU case: - declared in ffs_extern.h: int softdep_complete_trunc(struct vnode *, void *); void softdep_unmount(struct mount *); int softdep_move_dependencies(struct buf *, struct buf *); void softdep_setup_blkfree(struct mount *, struct buf *, ufs2_daddr_t, i= nt, struct workhead *); void softdep_setup_inofree(struct mount *, struct buf *, ino_t, struct workhead *); void softdep_setup_sbupdate(struct ufsmount *, struct fs *, struct buf *= ); void *softdep_setup_trunc(struct vnode *vp, off_t length, int flags); int softdep_prealloc(struct vnode *, int); int softdep_journal_lookup(struct mount *, struct vnode **); - declared in ufs_extern.h void softdep_setup_unlink(struct inode *, struct inode *); void softdep_setup_create(struct inode *, struct inode *); void softdep_revert_create(struct inode *, struct inode *); void softdep_setup_rmdir(struct inode *, struct inode *); void softdep_revert_rmdir(struct inode *, struct inode *); void softdep_setup_link(struct inode *, struct inode *); void softdep_revert_link(struct inode *, struct inode *); void softdep_setup_dotdot_link(struct inode *, struct inode *); void softdep_setup_mkdir(struct inode *, struct inode *); void softdep_revert_mkdir(struct inode *, struct inode *); Fixing is not obvios for me. Some of non-SU stub functions return 0, and some of them panic. --=20 wbr, pluknet