From owner-svn-src-head@freebsd.org Tue Sep 29 14:04:44 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E6CE1424744; Tue, 29 Sep 2020 14:04:44 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C11NX4BG9z4qYR; Tue, 29 Sep 2020 14:04:44 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qk1-x741.google.com with SMTP id w16so4382913qkj.7; Tue, 29 Sep 2020 07:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=OFMPVGbTphtJsBZwhL7TVGx/Xmn1SX37RSrI/HERAKY=; b=blo5d6rDB4tTy0Z+XitDA/YoWtYjC0lmGQw07BWygBgGlZpqmzDFXs4kF3YzO3vCMk UqTtF8jB2geeHLtKQB7cw9VRzbAUWggd8Lw7oW0Mw4hG3KNkluYDZdj3HG6nd0o6r57V EDMKyC5EHDgxVbKk8PHmdTNOto7iOBy6jOvgT3CQZ8ondV3fSxKzdADIbszlCoFQ9xIb z9+VYHqykyEzug9IqMy3LwgxPx/jCS0R+aUyZzwCHZlMAliZ78WoK5gF1YJQb1rK1SlK rQQ2/D3wSSXWQcXdEZN2Dpq01H03Gyq8V7iMFfY/4YXb55YsCNglGhUnzHq8q4kkacH7 5VWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=OFMPVGbTphtJsBZwhL7TVGx/Xmn1SX37RSrI/HERAKY=; b=Rbiu9fGRK6HLmkEIFnRtHivewfsgWzN26O325yaCDlIxrsTJP/O97DeL5opOseypLm 1jTHpRjh1YMSC50qBKPxQC2/4jhh4bxVR5/XQ7XcdSC+DHUcp3EmPrQld2xv7hHBhWVW qQAyWZLrd/6teNlnokM9V6kyX1noEo8y0Aq5fSUroHBQhRK/Nwaw1vLYPKc7zwfcA4zN p26PC5PjlR4EoYJVQ89K5LgN3absArSCSbBzsUjD5T0LILPvFhVYO62Cp4yKTnswOu9t 1wn/eL+5baTgf6rPeUIsDVOPRuzzMzlv4hoxG99RM8AnJGQaHR+IC1ZfHL+tYFt78lz9 /2wA== X-Gm-Message-State: AOAM530uXsrhEzhw4FZ/fiyZPTg0x42185SLCjwMfCcx2ILxtS0WtSUa no72YnCAvaCEzmlCrVhwlM/eYYw4Kf4xsA== X-Google-Smtp-Source: ABdhPJykij0CJg3IsE3Jl5mE23xEmOIlHGLKmkvtxICuR5S9sQMTdZYw9l1iysrNqB8WNUPgHE43JA== X-Received: by 2002:a05:620a:13d0:: with SMTP id g16mr4256047qkl.489.1601388283239; Tue, 29 Sep 2020 07:04:43 -0700 (PDT) Received: from raichu (toroon0560w-lp130-01-174-88-77-103.dsl.bell.ca. [174.88.77.103]) by smtp.gmail.com with ESMTPSA id t11sm5346198qtp.32.2020.09.29.07.04.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 07:04:42 -0700 (PDT) Sender: Mark Johnston Date: Tue, 29 Sep 2020 10:04:40 -0400 From: Mark Johnston To: Kyle Evans Cc: src-committers , svn-src-all , svn-src-head Subject: Re: svn commit: r366252 - head/sys/contrib/openzfs/module/os/freebsd/zfs Message-ID: <20200929140440.GC26914@raichu> References: <202009291341.08TDflV3016426@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4C11NX4BG9z4qYR X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 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, 29 Sep 2020 14:04:45 -0000 On Tue, Sep 29, 2020 at 08:47:37AM -0500, Kyle Evans wrote: > On Tue, Sep 29, 2020 at 8:42 AM Mark Johnston wrote: > > > > Author: markj > > Date: Tue Sep 29 13:41:47 2020 > > New Revision: 366252 > > URL: https://svnweb.freebsd.org/changeset/base/366252 > > > > Log: > > ZFS: Fix a logic bug in the FreeBSD getpages VOP > > > > This was introduced when I merged r361287 to OpenZFS and has been fixed > > there already, commit 3f6bb6e43fd68e. > > > > Reported by: swills > > Reviewed by: allanjude, freqlabs, mmacy > > > > I think this should have been a commit to vendor-sys/zfs/dist with an > svn merge into sys/contrib/openzfs to make 100% sure that there's no > merge conflict (even trivial) upon mmacy's next import, though it's > perhaps not likely for the code to change anymore upstream and svn > might be smart enough to realize if the diff matches. You might > consider going ahead and committing the diff to vendor-sys and doing a > record-only MFC of that commit into sys/contrib/openzfs. Done in r366254.