From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <w.bumiller@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 09EB66024D
for <pbs-devel@lists.proxmox.com>; Wed, 12 Jan 2022 15:10:37 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id F2FC32CA9
for <pbs-devel@lists.proxmox.com>; Wed, 12 Jan 2022 15:10:36 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 6B97E2C9E
for <pbs-devel@lists.proxmox.com>; Wed, 12 Jan 2022 15:10:36 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 427F346C84
for <pbs-devel@lists.proxmox.com>; Wed, 12 Jan 2022 15:10:36 +0100 (CET)
Date: Wed, 12 Jan 2022 15:10:35 +0100
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Message-ID: <20220112141035.3rtm4z4isqd6tqs7@olga.proxmox.com>
References: <20211217081000.1061796-1-d.csapak@proxmox.com>
<20211217081000.1061796-3-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20211217081000.1061796-3-d.csapak@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.403 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: Re: [pbs-devel] [PATCH proxmox v3 2/3] proxmox-sys: add
FileSystemInformation struct and helper
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 12 Jan 2022 14:10:37 -0000
minor nit...
On Fri, Dec 17, 2021 at 09:09:53AM +0100, Dominik Csapak wrote:
> code mostly copied from proxmox-backups 'disk_usage'
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> proxmox-sys/src/fs/mod.rs | 39 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 39 insertions(+)
>
> diff --git a/proxmox-sys/src/fs/mod.rs b/proxmox-sys/src/fs/mod.rs
> index 9fe333b..f8a7744 100644
> --- a/proxmox-sys/src/fs/mod.rs
> +++ b/proxmox-sys/src/fs/mod.rs
> @@ -102,3 +102,42 @@ impl CreateOptions {
> */
> }
>
> +/// Information about a mounted file system from statfs64 syscall
> +pub struct FileSystemInformation {
> + /// total bytes available
> + pub total: u64,
> + /// bytes used
> + pub used: u64,
> + /// bytes available to an unprivileged user
> + pub available: u64,
> + /// total number of inodes
> + pub total_inodes: u64,
> + /// free number of inodes
> + pub free_inodes: u64,
> + /// the type of the filesystem (see statfs64(2))
> + pub fs_type: i64,
> + /// the filesystem id
> + pub fs_id: libc::fsid_t,
> +}
> +
> +/// Get file system information from path
> +pub fn fs_info(path: &std::path::Path) -> Result<FileSystemInformation, Error> {
If you use `NixPath` below anyway, may as well go all the way:
pub fn fs_info<P: ?Sized + NixPath>(path: &P) -> nix::Result<FileSystemInformation> {
(note the error type change since that's the only kind of error
appearing in this function)
Otherwise, you could at least go the `std` way of `<P: AsRef<Path>>(path: P)`.
(We're already mixing these a bit, but `&Path` is the least convenient
way for callers to interact with)
> + let mut stat: libc::statfs64 = unsafe { std::mem::zeroed() };
> +
> + use nix::NixPath;
> +
> + let res = path.with_nix_path(|cstr| unsafe { libc::statfs64(cstr.as_ptr(), &mut stat) })?;
> + nix::errno::Errno::result(res)?;
> +
> + let bsize = stat.f_bsize as u64;
> +
> + Ok(FileSystemInformation {
> + total: stat.f_blocks * bsize,
> + used: (stat.f_blocks - stat.f_bfree) * bsize,
> + available: stat.f_bavail * bsize,
> + total_inodes: stat.f_files,
> + free_inodes: stat.f_ffree,
> + fs_type: stat.f_type,
> + fs_id: stat.f_fsid,
> + })
> +}
> --
> 2.30.2