summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorSusant Kumar Palai <spalai@redhat.com>2013-08-06 14:45:06 -0700
committerJeremy Allison <jra@samba.org>2013-08-09 10:51:24 -0700
commita973b1ce7a94bd3f11432a6f32b9d9b13b868dfb (patch)
tree34b599c20046b1e6865b23abbf0a9eb4e105f6c1 /source3/modules
parent44eb680071731e14b76fca6ce1c983b1bd0be866 (diff)
downloadsamba-a973b1ce7a94bd3f11432a6f32b9d9b13b868dfb.tar.gz
samba-a973b1ce7a94bd3f11432a6f32b9d9b13b868dfb.tar.bz2
samba-a973b1ce7a94bd3f11432a6f32b9d9b13b868dfb.zip
VFS plugin was sending the actual size of the volume instead of the total number of block units because of which windows was getting the wrong volume capacity.
Signed-off-by: Susant Kumar Palai <spalai@redhat.com> Reviewed-by: Jeremy Allison <jra@samba.org> Reviewed-by: Christopher R. Hertel <crh@samba.org>
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/vfs_glusterfs.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index 1323e0e17f..af8d5b739f 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -301,7 +301,6 @@ static uint64_t vfs_gluster_disk_free(struct vfs_handle_struct *handle,
uint64_t *dsize_p)
{
struct statvfs statvfs = { 0, };
- uint64_t dfree = 0;
int ret;
ret = glfs_statvfs(handle->data, path, &statvfs);
@@ -309,19 +308,17 @@ static uint64_t vfs_gluster_disk_free(struct vfs_handle_struct *handle,
return -1;
}
- dfree = statvfs.f_bsize * statvfs.f_bavail;
-
if (bsize_p != NULL) {
- *bsize_p = statvfs.f_bsize;
+ *bsize_p = (uint64_t)statvfs.f_bsize; /* Block size */
}
if (dfree_p != NULL) {
- *dfree_p = dfree;
+ *dfree_p = (uint64_t)statvfs.f_bavail; /* Available Block units */
}
if (dsize_p != NULL) {
- *dsize_p = statvfs.f_bsize * statvfs.f_blocks;
+ *dsize_p = (uint64_t)statvfs.f_blocks; /* Total Block units */
}
- return dfree;
+ return (uint64_t)statvfs.f_bavail;
}
static int vfs_gluster_get_quota(struct vfs_handle_struct *handle,