Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2.1] Fix module build with -Werror #13196

Merged
merged 1 commit into from
Mar 17, 2022
Merged

[2.1] Fix module build with -Werror #13196

merged 1 commit into from
Mar 17, 2022

Conversation

ghost
Copy link

@ghost ghost commented Mar 11, 2022

Motivation and Context

zfs-2.1.3 fails to build on some systems in a release configuration. This was missed by the CI because it's all debug builds.
See #13194

Description

This is a direct commit to zfs-2.1-release to fix release builds that
error out on an unused variable. The issue is avoided on master by a
huge series of commits that change how the ASSERT macros work, but that
is not feasible to backport.

How Has This Been Tested?

Built on FreeBSD

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)
  • 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:

Fix module build with -Werror
c7e8e87 
This is a direct commit to zfs-2.1-release to fix release builds that
error out on an unused variable.  The issue is avoided on master by a
huge series of commits that change how the ASSERT macros work, but that
is not feasible to backport.

Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Mar 11, 2022
@nabijaczleweli nabijaczleweli mentioned this pull request Mar 12, 2022
Merged
13 tasks
tonyhutter
tonyhutter approved these changes Mar 14, 2022
View reviewed changes
Copy link
Contributor

@tonyhutter tonyhutter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine.

We just pushed out zfs-2.1.4-staging - would you mind making this PR against that branch?

@ghost ghost changed the base branch from zfs-2.1-release to zfs-2.1.4-staging March 15, 2022 13:32
@ghost
Copy link
Author

ghost commented Mar 15, 2022

👍 Changed base to the staging branch.

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Mar 15, 2022
@behlendorf behlendorf merged commit 7b215d9 into openzfs:zfs-2.1.4-staging Mar 17, 2022
@ghost ghost deleted the plan-b branch March 17, 2022 21:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@behlendorf behlendorf

Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@behlendorf @ikozhukhov @tonyhutter