From owner-svn-src-head@freebsd.org Thu Nov 5 12:08:50 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 86F69466A03; Thu, 5 Nov 2020 12:08:50 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) (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 4CRj3j643sz4bK5; Thu, 5 Nov 2020 12:08:49 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-wr1-x430.google.com with SMTP id x7so1488766wrl.3; Thu, 05 Nov 2020 04:08:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=N1hC0sGueWOQEPbx/IvRvvWYsF83Ep2Y7BjvNqH8jdI=; b=AshUHqH0frDAA18iQ1TtWfnKn2gWuBpM8tSBkoqJp2s/I9X7wuJkiCQRs/+lZUD1RM 5r4zDGZe/QzWt+ZbGSxMbgQ3Ar/xc8G4i80nFMG/A24w/CF6BE88WkKX4F7bsK+pujG9 iAqM/n66NGqzTtUGaBf28UPePltPIfXej+Fu3vCxOXm1Z5ery+uphhoaCrm2u7uN9kks M5PGAxOSLWBZuho9u4FFmKQ95/t28wrAb6mbcLnWd2yzcAZAa/IFC9HvCNtrdGSkUbV9 NGQvfku1cvC+QaiscBrVfJibUoIFPzR1woHmBFN4cioG7BikbqccWaMk2iMskzeuBAcl /DdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=N1hC0sGueWOQEPbx/IvRvvWYsF83Ep2Y7BjvNqH8jdI=; b=Oh714gWSOj/vOfLCccJ6m0HxX6HBcSx2gQrqrG6FQ7xg2XPADfke/6/zQV+ZQ8yR2c IvLHOCphXDuaqkDIB34OtFQLx+152bP7gZtMTBxU66x6u0fsQT3zSqcKbUUU+bYxeWiZ FEC4FIAgpsFlKlSk1tYxuR8LC8kGpk0eYNLRleO6i1LlY4MN/PlGMFcbHP6bTa/kRoe/ 6mmgONrszj/5G6+TeZJt08a914cZ5JIclXQT6c7ClUDlWZgrl8M2RkVrxF81U03DOyjw Il5U5QTDotciQQSmFV0cC+/vv5SpOSyT0ZLvOZtTWhw3XtjtlbQC1MwiV88x1Q79mONY Hxtw== X-Gm-Message-State: AOAM532yNY18MalDs2fxeWtTJ3+1O1mOzU0Nl5cGbslADcEj9a6RQ2Hs 4iEB877lQi8uZd4QdOtOeHRCHhVocIUGCq7bOkItRCy7HJw= X-Google-Smtp-Source: ABdhPJznFxlhDZZchM1Pf5nMRVrErRCbzC6hvsaGL5FUViPSYEKd8u0Zdif9xhePZ0fZ66PDvpzBrb+I0KuEvwi2Y18= X-Received: by 2002:adf:9b98:: with SMTP id d24mr723532wrc.17.1604578128408; Thu, 05 Nov 2020 04:08:48 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a5d:4c4f:0:0:0:0:0 with HTTP; Thu, 5 Nov 2020 04:08:47 -0800 (PST) In-Reply-To: <20201105074702.GA83145@FreeBSD.org> References: <202011042118.0A4LIq3H077210@repo.freebsd.org> <20201105074702.GA83145@FreeBSD.org> From: Mateusz Guzik Date: Thu, 5 Nov 2020 13:08:47 +0100 Message-ID: Subject: Re: svn commit: r367343 - in head/sys/contrib/openzfs/include/os: freebsd/zfs/sys linux/zfs/sys To: Alexey Dokuchaev Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4CRj3j643sz4bK5 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=AshUHqH0; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of mjguzik@gmail.com designates 2a00:1450:4864:20::430 as permitted sender) smtp.mailfrom=mjguzik@gmail.com X-Spamd-Result: default: False [-1.94 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::430:from]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::430:from:127.0.2.255]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::430:from]; NEURAL_HAM_SHORT(-0.94)[-0.937]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[svn-src-all,svn-src-head]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 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: Thu, 05 Nov 2020 12:08:50 -0000 On 11/5/20, Alexey Dokuchaev wrote: > On Wed, Nov 04, 2020 at 09:18:52PM +0000, Mateusz Guzik wrote: >> New Revision: 367343 >> URL: https://svnweb.freebsd.org/changeset/base/367343 >> >> Log: >> zfs: add branch prediction to ZFS_ENTER and ZFS_VERIFY_ZP macros >> >> They are expected to fail only in corner cases. >> >> Modified: >> head/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_znode_impl.h >> head/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_znode_impl.h > > Since my earlier email was ignored, I'd take this chance to ask again: > why Linux-specific bits present in the head and had to be updated like > in this commit? They shouldn't have made past the vendor branch, no? > I don't know the reasoning for putting these files here. I suspect this is to make merging easier. fwiw I don't think they are a problem. The patch at hand modified them as it was based on the work against the upstream repo and followed suit -- Mateusz Guzik