Skip to content

Add ioctl FS_IOC_{G,S}ETVERSION and FS_IOC_{G,S}ETFLAGS#3089

Closed
ETKNeil wants to merge 1 commit into
rust-lang:mainfrom
ETKNeil:add-ioctl-flags
Closed

Add ioctl FS_IOC_{G,S}ETVERSION and FS_IOC_{G,S}ETFLAGS#3089
ETKNeil wants to merge 1 commit into
rust-lang:mainfrom
ETKNeil:add-ioctl-flags

Conversation

@ETKNeil

@ETKNeil ETKNeil commented Jan 23, 2023

Copy link
Copy Markdown
Contributor

@rustbot

rustbot commented Jan 23, 2023

Copy link
Copy Markdown
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @JohnTitor (or someone else) soon.

Please see the contribution instructions for more information.

@JohnTitor

Copy link
Copy Markdown
Member

Seems the values are different on i686-unknown-linux-gnu.

@ETKNeil

ETKNeil commented Feb 3, 2023

Copy link
Copy Markdown
Contributor Author

Seems the values are different on i686-unknown-linux-gnu.

Indeed, I fail to expand the macros, I did so for all the supported arch now

// where S stands for size (int, long, struct...)
// where T stands for type ('f','v','X'...)
// where N stands for NR (NumbeR)
if #[cfg(any(target_arch = "x86"))] {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This any doesn't do anything and should go to an arch-specific file.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Uhm I don't see an arch specific for x86 and x86_64 thus why I added them to generic, note sparc, powerpc and mips which are all the arch specific supported by libc for linux-like are covered so by doing so I think all case are covered.

The superfluous any were removed

@JohnTitor JohnTitor Feb 14, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

You could make a new module like mips. This structure is for arch-dependent declarations and using cfgs with target_arch would lose the meaning here.

@bors

bors commented Feb 12, 2023

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #3109) made this pull request unmergeable. Please resolve the merge conflicts.

@JohnTitor

Copy link
Copy Markdown
Member

Could you also fix the merge conflict and squash commits into one?

@ETKNeil

ETKNeil commented Feb 21, 2023

Copy link
Copy Markdown
Contributor Author

Could you also fix the merge conflict and squash commits into one?

Done

@JohnTitor

Copy link
Copy Markdown
Member

Sorry for the delay! @bors r+

@bors

bors commented Apr 19, 2023

Copy link
Copy Markdown
Contributor

📌 Commit 011c1e1 has been approved by JohnTitor

It is now in the queue for this repository.

@bors

bors commented Apr 19, 2023

Copy link
Copy Markdown
Contributor

⌛ Testing commit 011c1e1 with merge aed89a5...

bors added a commit that referenced this pull request Apr 19, 2023
@bors

bors commented Apr 19, 2023

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-actions

@fsavy-tehtris

Copy link
Copy Markdown
Contributor

Could we retry this please? The CI logs have expired so we can't know what went wrong.

@JohnTitor

Copy link
Copy Markdown
Member

@bors retry

@fsavy-tehtris

Copy link
Copy Markdown
Contributor

Looks like this is stuck in Bors queue @JohnTitor

@fsavy-tehtris

Copy link
Copy Markdown
Contributor

@bors retry

@bors

bors commented Oct 9, 2023

Copy link
Copy Markdown
Contributor

@fsavy-tehtris: 🔑 Insufficient privileges: not in try users

@JohnTitor

Copy link
Copy Markdown
Member

@bors retry

@bors

bors commented Oct 9, 2023

Copy link
Copy Markdown
Contributor

⌛ Testing commit 011c1e1 with merge 65dd811...

bors added a commit that referenced this pull request Oct 9, 2023
@bors

bors commented Oct 9, 2023

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-actions

bors added a commit that referenced this pull request Oct 28, 2023
Add ioctl FS_IOC_* version and flag constants

This is a tentative to fix #3089 because the original author is unlikely to revisit it.

I've added the missing architectures for the constants on Linux, I think they should all be covered now.
bors added a commit that referenced this pull request Oct 31, 2023
Add ioctl FS_IOC_* version and flag constants

This is a tentative to fix #3089 because the original author is unlikely to revisit it.

I've added the missing architectures for the constants on Linux, I think they should all be covered now.
@bors

bors commented Nov 1, 2023

Copy link
Copy Markdown
Contributor

⌛ Testing commit 011c1e1 with merge ecfff18...

bors added a commit that referenced this pull request Nov 1, 2023
@JohnTitor

Copy link
Copy Markdown
Member

@bors retry r-

@JohnTitor

Copy link
Copy Markdown
Member

Superseded by #3396, thanks anyway!

@JohnTitor JohnTitor closed this Nov 1, 2023
bors added a commit that referenced this pull request Nov 9, 2023
Add ioctl FS_IOC_* version and flag constants

This is a tentative to fix #3089 because the original author is unlikely to revisit it.

I've added the missing architectures for the constants on Linux, I think they should all be covered now.
bors added a commit that referenced this pull request Nov 14, 2023
Add ioctl FS_IOC_* version and flag constants

This is a tentative to fix #3089 because the original author is unlikely to revisit it.

I've added the missing architectures for the constants on Linux, I think they should all be covered now.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants