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

Add STATX_DIOALIGN (introduced in linux v6.1) #3076

Merged
merged 1 commit into from
Feb 20, 2023
Merged

Add STATX_DIOALIGN (introduced in linux v6.1) #3076

merged 1 commit into from
Feb 20, 2023

Conversation

ETKNeil
Copy link
Contributor

@ETKNeil ETKNeil commented Jan 19, 2023 •
edited
Loading

The STATX_DIOALIGN constant was introduced in linux 6.1

The statx structure thus gained 2 more fields

@rustbot
Copy link
Collaborator

rustbot commented Jan 19, 2023

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.

@ETKNeil ETKNeil mentioned this pull request Jan 20, 2023
Merged
@ETKNeil ETKNeil force-pushed the add-statx-dioalign branch from f19c4cc to df4f6b9 Compare January 20, 2023 08:34
@JohnTitor
Copy link
Member

Seems CI still fails, could you check?

@ETKNeil
Copy link
Contributor Author

ETKNeil commented Jan 31, 2023

Seems CI still fails, could you check?
CI Failed with

cargo:warning=/checkout/target/x86_64-unknown-linux-gnu/debug/build/libc-test-550781ad693ddf96/out/main.c:44809:73: error: 'STATX_DIOALIGN' undeclared here (not in a function)

Which indicates me that the image used in the CI is not linux 6.1+, however I removed STATX_DIOALIGN from the linux.txt list so it shouldn't test it (and I whitelisted it inside the libc-test/build.rs
I have no idea how your CI is setup tho but this shouldn't happen if I refer to other code examples with similar fate (RTNLGRP_BRVLAN for instance)

@JohnTitor
Copy link
Member

JohnTitor commented Feb 3, 2023 •
edited
Loading

Note that the semver list is different from the libc-test, and you added the const to the branch for musl/sparc64 on libc-test/build.rs, that's why it fails. You have to ignore it unconditionally.

@ETKNeil
Copy link
Contributor Author

ETKNeil commented Feb 6, 2023 •
edited
Loading

Note that the semver list is different from the libc-test, and you added the const to the branch for musl/sparc64 on libc-test/build.rs, that's why it fails. You have to ignore it unconditionally.

Oh ok, I thought the semver was used to build the main.rs, I see that I got that wrong. I moved the conditional branch to another one, I missed the sparc64 condition, I wanted to put the constant close to something related.

Note CI is broken for freebsd 14 (on setup) else the rest pass, sorry to have made you lose your time, your project is a bit complex to understand

@JohnTitor
Copy link
Member

Note CI is broken for freebsd 14

It was fixed on master already, it happens here because the branch is old.

Could you squash commits into one?

@JohnTitor
Copy link
Member

LGTM, thank you :)

@bors r+

@bors
Copy link
Contributor

bors commented Feb 20, 2023

📌 Commit 69f06d1 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Feb 20, 2023

⌛ Testing commit 69f06d1 with merge 5d8aee5...

bors added a commit that referenced this pull request Feb 20, 2023
@bors
Auto merge of #3076 - ETKNeil:add-statx-dioalign, r=JohnTitor
5d8aee5 
Add STATX_DIOALIGN (introduced in linux v6.1)

The [STATX_DIOALIGN](https://elixir.bootlin.com/linux/v6.1/A/ident/STATX_DIOALIGN) constant was introduced in linux 6.1

The statx structure thus gained [2 more fields](https://elixir.bootlin.com/linux/v6.1/source/include/uapi/linux/stat.h#L127)
@bors
Copy link
Contributor

bors commented Feb 20, 2023

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

@bors retry timeout

@bors
Copy link
Contributor

bors commented Feb 20, 2023

⌛ Testing commit 69f06d1 with merge ffd9cca...

bors added a commit that referenced this pull request Feb 20, 2023
@bors
Auto merge of #3076 - ETKNeil:add-statx-dioalign, r=JohnTitor
ffd9cca 
Add STATX_DIOALIGN (introduced in linux v6.1)

The [STATX_DIOALIGN](https://elixir.bootlin.com/linux/v6.1/A/ident/STATX_DIOALIGN) constant was introduced in linux 6.1

The statx structure thus gained [2 more fields](https://elixir.bootlin.com/linux/v6.1/source/include/uapi/linux/stat.h#L127)
@bors
Copy link
Contributor

bors commented Feb 20, 2023

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

Spurious:

 error: could not download file from 'https://static.rust-lang.org/dist/channel-rust-1.19.0.toml.sha256' to 'C:\Users\runneradmin\.rustup\tmp\irutc_j7ef6jls9z_file': failed to make network request: error sending request for url (https://static.rust-lang.org/dist/channel-rust-1.19.0.toml.sha256): connection error: An existing connection was forcibly closed by the remote host. (os error 10054): connection error: An existing connection was forcibly closed by the remote host. (os error 10054): An existing connection was forcibly closed by the remote host. (os error 10054)

@bors retry

@bors
Copy link
Contributor

bors commented Feb 20, 2023

⌛ Testing commit 69f06d1 with merge bbac03b...

bors added a commit that referenced this pull request Feb 20, 2023
@bors
Auto merge of #3076 - ETKNeil:add-statx-dioalign, r=JohnTitor
bbac03b 
Add STATX_DIOALIGN (introduced in linux v6.1)

The [STATX_DIOALIGN](https://elixir.bootlin.com/linux/v6.1/A/ident/STATX_DIOALIGN) constant was introduced in linux 6.1

The statx structure thus gained [2 more fields](https://elixir.bootlin.com/linux/v6.1/source/include/uapi/linux/stat.h#L127)
@bors
Copy link
Contributor

bors commented Feb 20, 2023

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Feb 20, 2023

⌛ Testing commit 69f06d1 with merge f0caf9a...

bors added a commit that referenced this pull request Feb 20, 2023
@bors
Auto merge of #3076 - ETKNeil:add-statx-dioalign, r=JohnTitor
f0caf9a 
Add STATX_DIOALIGN (introduced in linux v6.1)

The [STATX_DIOALIGN](https://elixir.bootlin.com/linux/v6.1/A/ident/STATX_DIOALIGN) constant was introduced in linux 6.1

The statx structure thus gained [2 more fields](https://elixir.bootlin.com/linux/v6.1/source/include/uapi/linux/stat.h#L127)
@bors
Copy link
Contributor

bors commented Feb 20, 2023

💔 Test failed - checks-actions

@JohnTitor
Copy link
Member

No luck, @bors retry

@bors
Copy link
Contributor

bors commented Feb 20, 2023

⌛ Testing commit 69f06d1 with merge 9e63320...

@bors
Copy link
Contributor

bors commented Feb 20, 2023

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 9e63320 to master...

@bors bors merged commit 9e63320 into rust-lang:master Feb 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohnTitor JohnTitor JohnTitor approved these changes

Assignees

@JohnTitor JohnTitor

Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ETKNeil @rustbot @JohnTitor @bors