From owner-freebsd-current@FreeBSD.ORG Mon Sep 15 23:55:39 2008 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 27EA11065675 for ; Mon, 15 Sep 2008 23:55:39 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from fk-out-0910.google.com (fk-out-0910.google.com [209.85.128.190]) by mx1.freebsd.org (Postfix) with ESMTP id ACFEC8FC0A for ; Mon, 15 Sep 2008 23:55:33 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: by fk-out-0910.google.com with SMTP id k31so2170438fkk.11 for ; Mon, 15 Sep 2008 16:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:message-id:user-agent:mime-version:content-type; bh=Eb4/z64Bajthzo/pNgWCSWYgbKEvz79SrgZGzn9h9MU=; b=A5gohxs0bFWvUc+ris4kMjYjbI7NaRRUEbXxFtqEPxx/395hJKttTmxVk56l8U/jE+ UryMUphe3/SkRJtD/DD2Vj8ZSyhewXZaRLGvT8PIrsrIJRF/6vOSRJ5gDnro1Rb4DwNJ TLu9FGhMw+/zF546iyChNj3CjREu7tdVhtX7o= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:message-id:user-agent :mime-version:content-type; b=O61/4AFbdCpeJxjXsVPWg9qleOSSKNnS0wjbGl+nakM4aF87Aw78jxX4TRg6MsizU8 KaHCEseJGnswxovCHxLAJJs3K+BwsL4gZw2m2HGCZKB2xF2J8aD1g05KfBCbmGe3K8v8 JIoesTcUhKJQhioy2LmTrRfrWLwOnKFfTXqIc= Received: by 10.181.22.8 with SMTP id z8mr107443bki.78.1221522932078; Mon, 15 Sep 2008 16:55:32 -0700 (PDT) Received: from localhost ( [89.178.186.140]) by mx.google.com with ESMTPS id y15sm14423817fkd.17.2008.09.15.16.55.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 15 Sep 2008 16:55:26 -0700 (PDT) From: swell.k@gmail.com To: Steven Schlansker References: <3A22C890-8724-4A41-8E67-2F6A8D4D7E3C@berkeley.edu> Date: Tue, 16 Sep 2008 03:55:20 +0400 Message-ID: <8663oxvuaf.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: freebsd-current@freebsd.org Subject: Re: pjd's ZFS 2008-07-27 patches against HEAD 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, 15 Sep 2008 23:55:39 -0000 Steven Schlansker writes: > I recently got fed up with all the deadlocks that ZFS seems to have on > my home server (things hang in zfs: states, nothing can kill them, > prevents rebooting, etc) so I decided to try out -CURRENT with the > latest ZFS patches. However, they no longer seem to apply cleanly. > Specifically, Revisions before r182371 should work. Or you can try -CURRENT some later time when pjd commit[1] his work on latest zfs version. [1] http://docs.FreeBSD.org/cgi/mid.cgi?20080829074738.GB3026 > [steven@universe:/usr/src]% bzcat ~/zfs_20080727.patch.bz2 | sudo > patch -s -C -p0 > 1 out of 14 hunks failed--saving rejects to cddl/contrib/opensolaris/ > lib/libzpool/common/sys/zfs_context.h.rej > 1 out of 11 hunks failed--saving rejects to sys/cddl/contrib/ > opensolaris/uts/common/fs/zfs/vdev_file.c.rej > 1 out of 33 hunks failed--saving rejects to sys/cddl/contrib/ > opensolaris/uts/common/fs/zfs/zfs_ctldir.c.rej > 1 out of 20 hunks failed--saving rejects to sys/cddl/contrib/ > opensolaris/uts/common/fs/zfs/zfs_replay.c.rej > 1 out of 115 hunks failed--saving rejects to sys/cddl/contrib/ > opensolaris/uts/common/fs/zfs/zfs_vnops.c.rej > 4 out of 29 hunks failed--saving rejects to sys/cddl/contrib/ > opensolaris/uts/common/fs/zfs/zfs_znode.c.rej > 1 out of 11 hunks failed--saving rejects to sys/kern/kern_jail.c.rej > > This is against a current HEAD (tag=. in csup as of 2 hours ago) > > I was wondering if there is a newer patch out there (I don't see > anything in ~pjd/patches) or if anyone has had any luck getting the > patch to apply cleanly to the latest sources. http://pastebin.com/m30db3356 I've just copied `+' lines from p4 and `-' lines from svn, nothing special. Try it at your own risk and don't blame me if you lose your precious data. ;) So far I haven't lost mine, although I have a bad experience with zfs metadata corruption in the past with and without pjd's patch. Another way is just collect and revert conflicting commits then apply the patch without modifying it. I've already lost count how many there are to revert.