Page MenuHomeFreeBSD

openzfs: Reduce local diffs
ClosedPublic

Authored by jhb on Sep 4 2024, 2:09 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Nov 12, 5:40 AM
Unknown Object (File)
Sat, Nov 9, 11:43 PM
Unknown Object (File)
Mon, Oct 21, 7:30 AM
Unknown Object (File)
Sun, Oct 20, 7:36 PM
Unknown Object (File)
Oct 5 2024, 3:15 PM
Unknown Object (File)
Oct 3 2024, 4:19 PM
Unknown Object (File)
Oct 2 2024, 5:33 AM
Unknown Object (File)
Sep 24 2024, 12:21 PM

Details

Summary

These are all local diffs that have no functional change.

Sponsored by: AFRL, DARPA

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

jhb requested review of this revision.Sep 4 2024, 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.

This revision is now accepted and ready to land.Oct 2 2024, 7:26 PM
emaste added inline comments.
sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h
52

This feels like a comment that would be useful upstream, but agreed there's little value in carrying this as a local diff.

sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c
689

I see 57 files with sizeof( and 385 with sizeof ( upstream (some files might have both styles and be double-counted) so it looks like our local diff is contrary to upstream's preferred style.

emaste added inline comments.
sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h
52

For context: https://github.com/openzfs/zfs/pull/14779/commits/810fb097682a077a618283835c0e93ad2acc2659 and 344986ff4cb6f.

@jhibbits do you think it's worth an upstream change to add a comment like this?

sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h
52

I think it can be dropped. In fact, I *think* kernel FPU support was added recently as part of the openssl work, so this might be able to be changed to 1 instead, but needs tested first.

This revision was automatically updated to reflect the committed changes.