tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

let disk_usage return StorageStatus and use it for datastores/nodes

Browse Source 
disk_usage returned the same values as defined in StorageStatus,
so simply use that

with that we can replace the logic of the datastore status with that
function and also use it for root disk usage of the nodes

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2020-06-09 10:01:09 +02:00
committed by Dietmar Maurer
parent da84cc52f4
commit 33070956af
4 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/api2/admin/datastore.rs
View File

@ -382,25 +382,8 @@ pub fn status(
_info: &ApiMethod,
_rpcenv: &mut dyn RpcEnvironment,
) -> Result<StorageStatus, Error> {
let datastore = DataStore::lookup_datastore(&store)?;
let base_path = datastore.base_path();
let mut stat: libc::statfs64 = unsafe { std::mem::zeroed() };
use nix::NixPath;
let res = base_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(StorageStatus {
total: stat.f_blocks*bsize,
used: (stat.f_blocks-stat.f_bfree)*bsize,
avail: stat.f_bavail*bsize,
})
crate::tools::disks::disk_usage(&datastore.base_path())
}
#[macro_export]