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

3.10.X API change: block_device_operations->release() returns void #1494

Closed
wants to merge 1 commit into from

Conversation

chrisrd
Copy link
Contributor

@chrisrd chrisrd commented Jun 3, 2013

Upstream commit db2a144 changed block_device_operations->release()
to return void.

Signed-off-by: Chris Dunlop [email protected]

@@ -0,0 +1,29 @@
dnl #
dnl # 2.10.x API change
Copy link
Contributor

Choose a reason for hiding this comment

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

This should say 3.10.x.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

On Wed, Jul 03, 2013 at 05:33:14AM -0700, Richard Yao wrote:

@@ -0,0 +1,29 @@
+dnl #
+dnl # 2.10.x API change

This should say 3.10.x.

Thanks. Fix pushed, but I'm not sure how that works with a
potential pull from Brian. Do I need to flatten the commits
somehow?

@ryao
Copy link
Contributor

ryao commented Jul 4, 2013

You can use git rebase -i HEAD^^ to merge the two commits and then git push -f origin for-3.10 to update the pull request.

@ryao ryao mentioned this pull request Jul 4, 2013
Upstream commit db2a144 changed block_device_operations->release()
to return void.

Signed-off-by: Chris Dunlop <[email protected]>
@chrisrd
Copy link
Contributor Author

chrisrd commented Jul 4, 2013

Rebased and pushed. Thanks for your help!

@behlendorf behlendorf closed this in a1d9543 Jul 9, 2013
unya pushed a commit to unya/zfs that referenced this pull request Dec 13, 2013
Linux kernel commit torvalds/linux@db2a144 changed the return type
of block_device_operations->release() to void.  Detect the expected
prototype and defined our callout accordingly.

Signed-off-by: Chris Dunlop <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes openzfs#1494
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants