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

tools: include blk-mq.h in bio tools #3877

Merged
merged 1 commit into from
Feb 23, 2022

Conversation

jeromemarchand
Copy link
Contributor

Kernel commit 24b83deb29b ("block: move struct request to blk-mq.h")
has moved struct request from blkdev.h to blk-mq.h. It results in
several bio tools to fail with errors of the following type:

error: incomplete definition of type 'struct request'

Since blk-mq.h had always included blkdev.h. it is safe to simply
replace the inclusion of blkdev.h by blk-mq-h. It works on both older
and newer kernel.

Fixes: #3869

Signed-off-by: Jerome Marchand jmarchan@redhat.com

Kernel commit 24b83deb29b ("block: move struct request to blk-mq.h")
has moved struct request  from blkdev.h to blk-mq.h. It results in
several bio tools to fail with errors of the following type:

error: incomplete definition of type 'struct request'

Since blk-mq.h had always included blkdev.h. it is safe to simply
replace the inclusion of blkdev.h by blk-mq-h. It works on both older
and newer kernel.

Fixes: iovisor#3869

Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
Copy link
Collaborator

@chenhengqi chenhengqi left a comment

Choose a reason for hiding this comment

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

LGTM. This should also close #3825.

@yonghong-song
Copy link
Collaborator

LGTM. Thanks for simpler solution!

@yonghong-song yonghong-song merged commit ee81072 into iovisor:master Feb 23, 2022
chenhengqi added a commit to chenhengqi/bcc that referenced this pull request Feb 24, 2022
Kernel commit 24b83deb29b ("block: move struct request to blk-mq.h")
and be6bfe36db17 ("block: inline hot paths of blk_account_io_*()")
introduce changes which break disksnoop.

Like iovisor#3748 and iovisor#3877 but for disksnoop, this commit fixes those issues.

Closes iovisor#3825.

Signed-off-by: Hengqi Chen <chenhengqi@outlook.com>
yonghong-song pushed a commit that referenced this pull request Feb 24, 2022
Kernel commit 24b83deb29b ("block: move struct request to blk-mq.h")
and be6bfe36db17 ("block: inline hot paths of blk_account_io_*()")
introduce changes which break disksnoop.

Like #3748 and #3877 but for disksnoop, this commit fixes those issues.

Closes #3825.

Signed-off-by: Hengqi Chen <chenhengqi@outlook.com>
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.

bio tools fail to compile, incomplete definition of type 'struct request'
3 participants