From owner-svn-src-head@freebsd.org Tue Aug 11 15:47:59 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F126A99F77C for ; Tue, 11 Aug 2015 15:47:58 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B0FCA967 for ; Tue, 11 Aug 2015 15:47:58 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: by wibhh20 with SMTP id hh20so202550983wib.0 for ; Tue, 11 Aug 2015 08:47:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=uMRmvSr5jvpPA/En9h7KEL4R8BD7sb00AupephLRokM=; b=kidRajFbWLs1ZFQI0ENcuRF3pfILg0GICGOiCTNVQvumA0chhJ5LWivvxJ/wMtfVcc Wa9qpDS65s9QR5CEciOs097876pZJCGV9+eEIi/knsFAdR1nTR44yJdn+AMGkq3FDY5d 8JVC79DL7YyZs9EZbl4hGS863SxVQObwxLWjKZZ2HreophJ7IbEh1zNlacO1AS3mtNMB PhsYLg7YYSGlKVU1F396uz3IudHycFiVMQpb99GChNlxEFhVPU3WxQ3rrStFQuBOSezg KT9mTGdKwcp8O1MStmdW0bKtS7alx5RY4yPk84V1yHV7KcyknU3Z/a0w5k8cFIibvV6D 0BMg== X-Gm-Message-State: ALoCoQlvM5eR/sm9D/9HiwM0iiyPK+ZP+atbmnit3ySEGbgRUwp2bRDGf+BNA0Y/oL6l90khpFCw X-Received: by 10.180.38.34 with SMTP id d2mr35364962wik.48.1439308070970; Tue, 11 Aug 2015 08:47:50 -0700 (PDT) Received: from [10.10.1.68] (82-69-141-170.dsl.in-addr.zen.co.uk. [82.69.141.170]) by smtp.gmail.com with ESMTPSA id lu5sm3598080wjb.9.2015.08.11.08.47.49 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 11 Aug 2015 08:47:49 -0700 (PDT) Subject: Re: svn commit: r286625 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs To: Andriy Gapon , Alexander Motin , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org References: <201508111039.t7BAdK1x071658@repo.freebsd.org> <55C9D3A5.1020000@FreeBSD.org> From: Steven Hartland Message-ID: <55CA1921.6030606@multiplay.co.uk> Date: Tue, 11 Aug 2015 16:47:45 +0100 User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 In-Reply-To: <55C9D3A5.1020000@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Tue, 11 Aug 2015 15:47:59 -0000 On 11/08/2015 11:51, Andriy Gapon wrote: > On 11/08/2015 13:39, Alexander Motin wrote: >> Author: mav >> Date: Tue Aug 11 10:39:19 2015 >> New Revision: 286625 >> URL: https://svnweb.freebsd.org/changeset/base/286625 >> >> Log: >> MFV r277425: >> 5376 arc_kmem_reap_now() should not result in clearing arc_no_grow >> Reviewed by: Christopher Siden >> Reviewed by: George Wilson >> Reviewed by: Steven Hartland >> Reviewed by: Richard Elling >> Approved by: Dan McDonald >> Author: Matthew Ahrens >> >> illumos/illumos-gate@2ec99e3e987d8aa273f1e9ba2b983557d058198c >> >> Modified: >> head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c > Alexander, > > thank you very much for bringing all these upstream changes into our tree. > It seems that some of the changes, though, non-trivially overlap with > FreeBSD-specific changes to ZFS code. I think that this change is one > of the examples. > It would be good if a strategy of the resolution of each non-trivial > conflict was described and possibly discussed. Reviewing the change > without knowing the general idea behind it is not always easy. > I actually eliminated most of the miss-matches between illumos and FreeBSD in this area pretty recently, so I'm not sure that there's actually many FreeBSD specific changes, hence conflicts. Given I worked in this area before I did also make a point of reviewing the upstream commit. That's not to say it wouldn't be good to review these sorts of changes especially given the potential impact, however we don't have a very good track record (myself included) in reviewing things so I'm concerned that would just become a real progress blocker. What do others think? Regards Steve