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

Rollup of 3 pull requests #1946

Merged
merged 6 commits into from
Oct 20, 2020
Merged

Rollup of 3 pull requests #1946

merged 6 commits into from
Oct 20, 2020

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

Kenta Tada and others added 6 commits October 20, 2020 23:22
Signed-off-by: Kenta Tada <Kenta.Tada@sony.com>
…=JohnTitor

Add definitions for Linux debug related MAGIC

This commit adds definitions for Linux debug related MAGIC to confirm if the filesystem for debug is mounted.

Signed-off-by: Kenta Tada <Kenta.Tada@sony.com>
Include sendfile64() for Linux

`sendfile` uses the `off_t` type, which is platform dependent. On 64-bit architectures, I can pass an `off64_t` as the third argument to `libc::sendfile`, but on 32-bit architectures, this does not compile. `sendfile64` on the other hand uses a 64-bit wide offset even on 32-bit architectures, so that `off64_t` can be used.

Excerpt from `man 2 sendfile`:

> The original Linux sendfile() system call was not designed to handle large file offsets. Consequently, Linux 2.4 added sendfile64(), with a wider type for the offset argument.

I hope that supporting Linux versions below 2.4 is not a requirement for libc.
@JohnTitor
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Oct 20, 2020

@JohnTitor: 🔑 Insufficient privileges: Not in reviewers

@JohnTitor
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Oct 20, 2020

📌 Commit f1d18c6 has been approved by JohnTitor

@bors
Copy link
Contributor

bors commented Oct 20, 2020

⌛ Testing commit f1d18c6 with merge 2995d71...

@bors
Copy link
Contributor

bors commented Oct 20, 2020

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: JohnTitor
Pushing 2995d71 to master...

@bors bors merged commit 2995d71 into rust-lang:master Oct 20, 2020
@JohnTitor JohnTitor deleted the rollup-66245hd branch October 20, 2020 23:37
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.

None yet

3 participants