On Tue, Apr 22, 2008 at 02:08:18PM +0200, Kris Kennaway wrote: > Kostik Belousov wrote: > >On Tue, Apr 22, 2008 at 12:31:45PM +0200, Andre Albsmeier wrote: > >>On Thu, 21-Feb-2008 at 14:13:22 +0200, Kostik Belousov wrote: > >>>On Thu, Feb 21, 2008 at 04:20:04AM -0700, Brett Bump wrote: > >>>>On Wed, 20 Feb 2008, Kostik Belousov wrote: > >>>> > >>>>>I cannot reproduce it locally. With patch applied, it compiles both > >>>>>GENERIC and GENERIC with options QUOTA added just fine. > >>>>> > >>>>>Check for partially applied patch. > >>>>> > >>>>Thanks Kostik. You can double check me on sizes, but it would appear > >>>>that > >>>>all files in the patch were touched, and I double checked my sources > >>>>with: > >>>>ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/6.2-RELEASE/src which > >>>>are > >>>The patch is against RELENG_6, not against RELENG_6_2. I see no point > >>>in backporting it to RELENG_6_2. > >>> > >>>BTW, I backported two fixes, one for another deadlock with snapshots and > >>>quotas, another for "ffs_blkfree: block already freed" panic and followed > >>>up fsck: softdep inconsistency error. > >>> > >>>New combined patch (against RELENG_6) is at > >>>http://people.freebsd.org/~kib/quotagiant/quotas-RELENG_6-20080221-1202.patch > >>I tried to apply this patch to recent RELENG_6 sources > >>but it failed at a lot of places. I think this is due to > >>changes to the tree after the above patch was made. > >> > >>Is there any newer patch available or is it possible to make > >>one which applies to recent RELENG_6 sources? > > > >http://people.freebsd.org/~kib/quotagiant/quotas-RELENG_6-20080422-1000.patch > > > >May be, I shall commit it finally. > > FYI scottl@ was asking about this yesterday, and seemed interested in > helping you to get it committed if necessary.
My worry is the possible mismerge. I do prefer to commit it now, after some authoritative "no problem seen" message.
pgpm7xrhCHnbv.pgp
Description: PGP signature