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.

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

6.5-compat: BLK_STS_NEXUS is renamed to BLK_STS_RESV_CONFLICT #15059

Merged
merged 1 commit into from
Jul 14, 2023

Conversation

ckane
Copy link
Contributor

@ckane ckane commented Jul 13, 2023

Motivation and Context

In Linux commit 7ba150834b840f6f5cdd07ca69a4ccf39df59a66 the BLK_STS_NEXUS macro was renamed to BLK_STS_RESV_CONFLICT

Description

I have added conditionally-compiled code to use BLK_STS_RESV_CONFLICT instead of BLK_STS_NEXUS if the former is found to be defined during configure. Additional autoconf tests have been added to look for it.

How Has This Been Tested?

Built on 6.4.2, compiled on 6.5rc1 but other blocking changes in new kernel prevent full build from completing.

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:

This change was introduced in Linux commit
7ba150834b840f6f5cdd07ca69a4ccf39df59a66

Signed-off-by: Coleman Kane <[email protected]>
@behlendorf behlendorf added the Status: Accepted Ready to integrate (reviewed, tested) label Jul 14, 2023
@behlendorf behlendorf merged commit d3d63ca into openzfs:master Jul 14, 2023
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Jul 21, 2023
This change was introduced in Linux commit
7ba150834b840f6f5cdd07ca69a4ccf39df59a66

Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes openzfs#15059
behlendorf pushed a commit that referenced this pull request Jul 21, 2023
This change was introduced in Linux commit
7ba150834b840f6f5cdd07ca69a4ccf39df59a66

Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #15059
tonyhutter pushed a commit that referenced this pull request Sep 27, 2023
This change was introduced in Linux commit
7ba150834b840f6f5cdd07ca69a4ccf39df59a66

Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #15059
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Dec 12, 2023
This change was introduced in Linux commit
7ba150834b840f6f5cdd07ca69a4ccf39df59a66

Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes openzfs#15059
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.

2 participants