sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-12 21:58:10 +03:00
Code

vfs_ceph_new: use low-level APIs for disk_free

Browse Source 
Start using libcephfs low-level APIs: get reference to root inode and
use it to query statfs. Requires an explicit put-inode to avoid resource
leakage by libcephfs.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15686

Signed-off-by: Shachar Sharon <ssharon@redhat.com>
Reviewed-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>
(cherry picked from commit 192b0cf8717d79197b985539c9db8ca07a89c570)
This commit is contained in:
Shachar Sharon 2024-06-16 14:50:08 +03:00 committed by Jule Anger
parent 565fe2e2f4
commit 94aa465513
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source3/modules/vfs_ceph_new.c
View File

@ -344,19 +344,26 @@ static uint64_t vfs_ceph_disk_free(struct vfs_handle_struct *handle,
uint64_t *dsize)
{
struct statvfs statvfs_buf = { 0 };
struct Inode *inode = NULL;
int ret;
ret = ceph_statfs(handle->data, smb_fname->base_name, &statvfs_buf);
if (ret < 0) {
DBG_DEBUG("[CEPH] ceph_statfs returned %d\n", ret);
return (uint64_t)status_code(ret);
ret = ceph_ll_lookup_root(handle->data, &inode);
if (ret != 0) {
DBG_DEBUG("[CEPH] ceph_ll_lookup_root returned %d\n", ret);
errno = -ret;
return (uint64_t)(-1);
}
/*
* Provide all the correct values.
*/
*bsize = statvfs_buf.f_bsize;
*dfree = statvfs_buf.f_bavail;
*dsize = statvfs_buf.f_blocks;
ret = ceph_ll_statfs(handle->data, inode, &statvfs_buf);
ceph_ll_put(handle->data, inode);
if (ret != 0) {
DBG_DEBUG("[CEPH] ceph_ll_statfs returned %d\n", ret);
errno = -ret;
return (uint64_t)(-1);
}
*bsize = (uint64_t)statvfs_buf.f_bsize;
*dfree = (uint64_t)statvfs_buf.f_bavail;
*dsize = (uint64_t)statvfs_buf.f_blocks;
DBG_DEBUG("[CEPH] bsize: %llu, dfree: %llu, dsize: %llu\n",
llu(*bsize),
llu(*dfree),