Date: Mon, 26 Apr 2010 20:57:01 +0400 From: pluknet <pluknet@gmail.com> To: Pawel Jakub Dawidek <pjd@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r207142 - head/sys/ufs/ffs Message-ID: <n2ya31046fc1004260957vabe4e76bm8dc51cc981ff5668@mail.gmail.com> In-Reply-To: <201004240736.o3O7aXVX062189@svn.freebsd.org> References: <201004240736.o3O7aXVX062189@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 24 April 2010 11:36, Pawel Jakub Dawidek <pjd@freebsd.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?n2ya31046fc1004260957vabe4e76bm8dc51cc981ff5668>