openzfs: Reduce local diffs
Needs ReviewPublic
Actions

Authored by jhb on Wed, Sep 4, 2:09 PM.

Details

Reviewers

mm
mav

Summary

These are all local diffs that have no functional change.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 59298
Build 56185: arc lint + arc unit

Event Timeline

jhb created this revision.Wed, Sep 4, 2:09 PM

Herald added subscribers: delphij, imp. · View Herald TranscriptWed, Sep 4, 2:09 PM

jhb requested review of this revision.Wed, Sep 4, 2:09 PM

Harbormaster completed remote builds in B59298: Diff 142856.Wed, Sep 4, 2:09 PM

jhb added inline comments.Wed, Sep 4, 2:09 PM

sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c
689	Possibly this should be fixed upstream instead, but having it as a local diff is needless.

FYI, we track a modified version of OpenZFS for CHERI and keep track of local changes in FreeBSD in a 'freebsd' branch forked from 'master' that we periodically rebase as we merge in upstream FreeBSD commits. It's a few months behind currently, but you can see the local changes we have here: https://github.com/openzfs/zfs/compare/master...CTSRD-CHERI:zfs:freebsd Some of these fixes should possibly go upstream. The lz4 allocator changes stand out as an odd local patch to me as they came in without a real log message during a merge.

jhb added a reviewer: mav.Sat, Sep 14, 9:38 AM