Skip to content

nvpair: chase FreeBSD xdrproc_t definition#18154

Merged
amotin merged 1 commit intoopenzfs:masterfrom
brooksdavis:freebsd-xdrproc_t-update
Jan 29, 2026
Merged

nvpair: chase FreeBSD xdrproc_t definition#18154
amotin merged 1 commit intoopenzfs:masterfrom
brooksdavis:freebsd-xdrproc_t-update

Conversation

@brooksdavis
Copy link
Copy Markdown
Contributor

As of FreeBSD 16, xdrproc_t will take exactly two arguments in both kernel and userspace in line with the Linux kernel.

Signed off by: Brooks Davis brooks@capabilitieslimited.co.uk

Motivation and Context

See the FreeBSD commit message for the logic behind this change https://cgit.freebsd.org/src/commit/?id=ac5a19ec6989675c8ec6c3ca245dba243d1a6416

Description

When building FreeBSD 16, always use the 2 direct argument prototype for xdrproc_t. I've committed a variant of this to FreeBSD.

How Has This Been Tested?

It builds and the prototype doesn't change the ABI on currently supported platforms (which is why the divergent declarations work at all).

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Quality assurance (non-breaking change which makes the code more robust against bugs)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

As of FreeBSD 16, xdrproc_t will take exactly two arguments in both
kernel and userspace in line with the Linux kernel.

Signed-off-by:	Brooks Davis <brooks@capabilitieslimited.co.uk>
@brooksdavis brooksdavis force-pushed the freebsd-xdrproc_t-update branch from 81f8aed to 620ca71 Compare January 23, 2026 11:22
@amotin amotin added the Status: Accepted Ready to integrate (reviewed, tested) label Jan 28, 2026
@amotin amotin merged commit b364720 into openzfs:master Jan 29, 2026
39 of 42 checks passed
@ixhamza ixhamza mentioned this pull request Jan 29, 2026
14 tasks
amotin pushed a commit to amotin/zfs that referenced this pull request Jan 29, 2026
As of FreeBSD 16, xdrproc_t will take exactly two arguments in both
kernel and userspace in line with the Linux kernel.

Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Alan Somers <asomers@freebsd.org>
Signed-off-by:	Brooks Davis <brooks@capabilitieslimited.co.uk>
Closes openzfs#18154
mcmilk pushed a commit to mcmilk/zfs that referenced this pull request Jan 31, 2026
As of FreeBSD 16, xdrproc_t will take exactly two arguments in both
kernel and userspace in line with the Linux kernel.

Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Alan Somers <asomers@freebsd.org>
Signed-off-by:	Brooks Davis <brooks@capabilitieslimited.co.uk>
Closes openzfs#18154
amotin pushed a commit to amotin/zfs that referenced this pull request Feb 3, 2026
As of FreeBSD 16, xdrproc_t will take exactly two arguments in both
kernel and userspace in line with the Linux kernel.

Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Alan Somers <asomers@freebsd.org>
Signed-off-by:	Brooks Davis <brooks@capabilitieslimited.co.uk>
Closes openzfs#18154
amotin pushed a commit to amotin/zfs that referenced this pull request Feb 3, 2026
As of FreeBSD 16, xdrproc_t will take exactly two arguments in both
kernel and userspace in line with the Linux kernel.

Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Alan Somers <asomers@freebsd.org>
Signed-off-by:	Brooks Davis <brooks@capabilitieslimited.co.uk>
Closes openzfs#18154
freebsd-git pushed a commit to freebsd/freebsd-ports that referenced this pull request Feb 4, 2026
Unbreak build on FreeBSD 16 by adding nvpair.c patch from upstream

Source: openzfs/zfs#18154
freebsd-git pushed a commit to freebsd/freebsd-ports that referenced this pull request Feb 4, 2026
Unbreak build on FreeBSD 16 by adding nvpair.c patch from upstream

Source: openzfs/zfs#18154
tonyhutter pushed a commit that referenced this pull request Feb 5, 2026
As of FreeBSD 16, xdrproc_t will take exactly two arguments in both
kernel and userspace in line with the Linux kernel.

Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Alan Somers <asomers@freebsd.org>
Signed-off-by:	Brooks Davis <brooks@capabilitieslimited.co.uk>
Closes #18154
brooksdavis added a commit to CTSRD-CHERI/zfs that referenced this pull request Feb 11, 2026
As of FreeBSD 16, xdrproc_t will take exactly two arguments in both
kernel and userspace in line with the Linux kernel.

Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Alan Somers <asomers@freebsd.org>
Signed-off-by:	Brooks Davis <brooks@capabilitieslimited.co.uk>
Closes openzfs#18154

(cherry picked from commit b364720)
brooksdavis added a commit to CTSRD-CHERI/zfs that referenced this pull request Feb 11, 2026
As of FreeBSD 16, xdrproc_t will take exactly two arguments in both
kernel and userspace in line with the Linux kernel.

Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Alan Somers <asomers@freebsd.org>
Signed-off-by:	Brooks Davis <brooks@capabilitieslimited.co.uk>
Closes openzfs#18154

(cherry picked from commit b364720)
brooksdavis added a commit to CTSRD-CHERI/zfs that referenced this pull request Feb 11, 2026
As of FreeBSD 16, xdrproc_t will take exactly two arguments in both
kernel and userspace in line with the Linux kernel.

Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Alan Somers <asomers@freebsd.org>
Signed-off-by:	Brooks Davis <brooks@capabilitieslimited.co.uk>
Closes openzfs#18154

(cherry picked from commit b364720)
brooksdavis added a commit to CTSRD-CHERI/zfs that referenced this pull request Feb 11, 2026
As of FreeBSD 16, xdrproc_t will take exactly two arguments in both
kernel and userspace in line with the Linux kernel.

Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Alan Somers <asomers@freebsd.org>
Signed-off-by:	Brooks Davis <brooks@capabilitieslimited.co.uk>
Closes openzfs#18154

(cherry picked from commit b364720)
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Feb 12, 2026
As of FreeBSD 16, xdrproc_t will take exactly two arguments in both
kernel and userspace in line with the Linux kernel.

Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Alan Somers <asomers@freebsd.org>
Signed-off-by:	Brooks Davis <brooks@capabilitieslimited.co.uk>
Closes openzfs#18154
pcd1193182 pushed a commit to KlaraSystems/zfs that referenced this pull request Apr 8, 2026
As of FreeBSD 16, xdrproc_t will take exactly two arguments in both
kernel and userspace in line with the Linux kernel.

Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Reviewed-by: Alan Somers <asomers@freebsd.org>
Signed-off-by:	Brooks Davis <brooks@capabilitieslimited.co.uk>
Closes openzfs#18154
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Status: Accepted Ready to integrate (reviewed, tested)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants