Page MenuHomeFreeBSD

Fix dtrace tools bootstrap on non-FreeBSD after OpenZFS import
ClosedPublic

Authored by arichardson on Aug 26 2020, 11:33 AM.

Details

Summary

This modifies one of the contrib headers but I can't see a better solution.

Test Plan

compiles again after this change on Ubuntu and macOS

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Could we change the contrib files upstream (OpenZFS), rather than maintaining the diffs?

Could we change the contrib files upstream (OpenZFS), rather than maintaining the diffs?

Yeah that would be ideal, just checking if the FreeBSD zfs developers are fine with this ugly change.

Looks reasonably noninvasive. I'm surprised it's that easy :)

This revision is now accepted and ready to land.Aug 26 2020, 7:15 PM

The contrib changes were upstream in https://github.com/openzfs/zfs/pull/10863. Is it safe to commit this now or will it cause any issues with the next import (it's exactly the same diff)?

ping? Are you planning to update the openzfs code soon or is it okay to commit this?