Date: Thu, 5 Nov 2020 13:08:47 +0100 From: Mateusz Guzik <mjguzik@gmail.com> To: Alexey Dokuchaev <danfe@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r367343 - in head/sys/contrib/openzfs/include/os: freebsd/zfs/sys linux/zfs/sys Message-ID: <CAGudoHF8xXOOSgFiogtH5e4kqj4R7kwW6DJmCKSJWAwL7HjA2w@mail.gmail.com> In-Reply-To: <20201105074702.GA83145@FreeBSD.org> References: <202011042118.0A4LIq3H077210@repo.freebsd.org> <20201105074702.GA83145@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 11/5/20, Alexey Dokuchaev <danfe@freebsd.org> 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 <mjguzik gmail.com>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGudoHF8xXOOSgFiogtH5e4kqj4R7kwW6DJmCKSJWAwL7HjA2w>