From nobody Fri Apr 14 02:05:57 2023
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyKYV17Zwz458Lj;
	Fri, 14 Apr 2023 02:06:06 +0000 (UTC)
	(envelope-from pjd@FreeBSD.org)
Received: from mail.dawidek.net (mail.dawidek.net [94.130.64.56])
	by mx1.freebsd.org (Postfix) with ESMTP id 4PyKYT67Qqz4JX0;
	Fri, 14 Apr 2023 02:06:05 +0000 (UTC)
	(envelope-from pjd@FreeBSD.org)
Authentication-Results: mx1.freebsd.org;
	none
Received: from [172.20.5.159] (p7123-ipngnfx01osakakita.osaka.ocn.ne.jp [114.160.237.123])
	by mail.dawidek.net (Postfix) with ESMTPSA id E627B4F567;
	Fri, 14 Apr 2023 04:06:01 +0200 (CEST)
Message-ID: <441db213-2abb-b37e-e5b3-481ed3e00f96@dawidek.net>
Date: Fri, 14 Apr 2023 11:05:57 +0900
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-main@freebsd.org
X-BeenThere: dev-commits-src-main@freebsd.org
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.10.0
Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75
To: Charlie Li <vishwin@freebsd.org>, Cy Schubert <Cy.Schubert@cschubert.com>
Cc: Mark Millard <marklmi@yahoo.com>, Mateusz Guzik <mjguzik@gmail.com>,
 dev-commits-src-main@freebsd.org,
 Current FreeBSD <freebsd-current@freebsd.org>
References: <20230413071032.18BFF31F@slippy.cwsent.com>
 <D0D9BD06-C321-454C-A038-C55C63E0DD6B@dawidek.net>
 <20230413063321.60344b1f@cschubert.com>
 <CAGudoHG3rCx93gyJTmzTBnSe4fQ9=m4mBESWbKVWtAGRxen_4w@mail.gmail.com>
 <20230413135635.6B62F354@slippy.cwsent.com>
 <c41f9ed6-e557-9255-5a46-1a22d4b32d66@dawidek.net>
 <319a267e-3f76-3647-954a-02178c260cea@dawidek.net>
 <b60807e9-f393-6e6d-3336-042652ddd03c@freebsd.org>
Content-Language: en-US
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
In-Reply-To: <b60807e9-f393-6e6d-3336-042652ddd03c@freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Rspamd-Queue-Id: 4PyKYT67Qqz4JX0
X-Spamd-Bar: ----
X-Spamd-Result: default: False [-4.00 / 15.00];
	REPLY(-4.00)[];
	ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE]
X-Rspamd-Pre-Result: action=no action;
	module=replies;
	Message is reply to one we originated
X-ThisMailContainsUnwantedMimeParts: N

On 4/14/23 09:23, Charlie Li wrote:
> Pawel Jakub Dawidek wrote:
>> Here is the change that reverts most of the modifications and disables 
>> cloning new blocks. It does retain ability to free existing cloned 
>> blocks and keeps block_cloning feature around, so upgraded pools can 
>> be imported and existing cloned blocks freed.
>>
>> It does not handle replaying ZIL with block-cloning logs, so make sure 
>> you import pools that were cleanly exported.
>>
>> I'd appreciate if someone who can reproduce those corruptions could 
>> try it.
>>
>> https://github.com/pjd/openzfs/commit/f2cfbcf76a733c44e25cba8c649162ef68047103
>>
> Does not apply to sys/contrib/openzfs tip, conflicts in 
> module/os/freebsd/zfs/zfs_vnops_os.c and module/zfs/dmu.c.

This should work:

https://people.freebsd.org/~pjd/patches/brt_revert.patch

-- 
Pawel Jakub Dawidek