From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>,
Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox v2 2/2] sys: open directories with O_CLOEXEC
Date: Mon, 02 Dec 2024 16:03:50 +0100 [thread overview]
Message-ID: <1733151717.gtcafqo4ls.astroid@yuna.none> (raw)
In-Reply-To: <1ac2bc33-e900-46de-955b-749020fd5751@proxmox.com>
On December 2, 2024 3:55 pm, Dominik Csapak wrote:
> On 12/2/24 15:01, Fabian Grünbichler wrote:
>> one small nit inline, otherwise:
>>
>> Reviewed-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
>>
>> On November 29, 2024 3:28 pm, Dominik Csapak wrote:
>>> so they don't linger around in case of a daemon reload.
>>>
>>> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
>>> ---
>>> new in v2
>>> proxmox-sys/src/fd.rs | 2 +-
>>> proxmox-sys/src/fs/dir.rs | 15 +++++++++------
>>> 2 files changed, 10 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/proxmox-sys/src/fd.rs b/proxmox-sys/src/fd.rs
>>> index 8d85bd2e..386e4222 100644
>>> --- a/proxmox-sys/src/fd.rs
>>> +++ b/proxmox-sys/src/fd.rs
>>> @@ -24,7 +24,7 @@ pub fn change_cloexec(fd: RawFd, on: bool) -> Result<(), anyhow::Error> {
>>> }
>>>
>>> pub(crate) fn cwd() -> Result<OwnedFd, nix::Error> {
>>> - open(".", OFlag::O_DIRECTORY, stat::Mode::empty())
>>> + open(".", crate::fs::DIR_FLAGS, stat::Mode::empty())
>>> }
>>>
>>> pub fn open<P>(path: &P, oflag: OFlag, mode: Mode) -> Result<OwnedFd, nix::Error>
>>> diff --git a/proxmox-sys/src/fs/dir.rs b/proxmox-sys/src/fs/dir.rs
>>> index c903ab87..a093ed99 100644
>>> --- a/proxmox-sys/src/fs/dir.rs
>>> +++ b/proxmox-sys/src/fs/dir.rs
>>> @@ -14,6 +14,9 @@ use proxmox_lang::try_block;
>>>
>>> use crate::fs::{fchown, CreateOptions};
>>>
>>> +/// The default [`OFlag`] we want to use when opening directories.
>>> +pub(crate) const DIR_FLAGS: OFlag = OFlag::O_DIRECTORY.union(OFlag::O_CLOEXEC);
>>
>> nit: I think I'd prefer a plain `|` here (they are the same in the
>> bitflags crate, which this is under the hood).
>>
>
> had the same thought at first, but the `BitOr` traits (and i guess all traits) are not
> const, so we can't directly to this here.
>
> what would be possible is this:
>
> ---
> pub(crate) const DIR_FLAGS: OFlag =
> OFlag::from_bits_truncate(OFlag::O_DIRECTORY.bits() | OFlag::O_CLOEXEC.bits());
> ---
>
> which is IMHO even uglier than using `.union()` ...
definitely uglier, and yes, I totally missed that:
https://github.com/rust-lang/rust-project-goals/issues/106
https://github.com/rust-lang/rust/issues/67792
and
https://github.com/bitflags/bitflags/issues/180
the latter which explicitly calls out `.union` and friends being added
to work around this limitation..
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2024-12-02 15:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-29 14:28 [pbs-devel] [PATCH proxmox v2 1/2] sys: fs: set CLOEXEC when creating temp files Dominik Csapak
2024-11-29 14:28 ` [pbs-devel] [PATCH proxmox v2 2/2] sys: open directories with O_CLOEXEC Dominik Csapak
2024-12-02 14:01 ` Fabian Grünbichler
2024-12-02 14:55 ` Dominik Csapak
2024-12-02 15:03 ` Fabian Grünbichler [this message]
2024-12-02 14:02 ` [pbs-devel] [PATCH proxmox v2 1/2] sys: fs: set CLOEXEC when creating temp files Fabian Grünbichler
2024-12-02 16:07 ` [pbs-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1733151717.gtcafqo4ls.astroid@yuna.none \
--to=f.gruenbichler@proxmox.com \
--cc=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox