[SCM] Samba Shared Repository - branch master updated

[Ira Cooper]

The branch, master has been updated
       via  2501afe vfs_ceph: fix disk_free_fn callback
      from  d1da1f7 s4-messaging: Unify list of possible messages into messaging.idl

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2501afe08b94a514d8e2f3eeb4a2c4edc9764979
Author: Yan, Zheng <zyan at redhat.com>
Date:   Fri Feb 13 18:25:57 2015 +0800

    vfs_ceph: fix disk_free_fn callback
    
    Free space and available space should be in unit of block size. Besides,
    we should call disk_norm() to adjust the returned values.
    
    Signed-off-by: Yan, Zheng <zyan at redhat.com>
    Reviewed-by: Ira Cooper <ira at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): Ira Cooper <ira at samba.org>
    Autobuild-Date(master): Mon Feb 16 18:14:02 CET 2015 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_ceph.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index ec72312..b074e2d 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -167,8 +167,9 @@ static uint64_t cephwrap_disk_free(struct vfs_handle_struct *handle,  const char
 		 * Provide all the correct values.
 		 */
 		*bsize = statvfs_buf.f_bsize;
-		*dfree = statvfs_buf.f_bsize * statvfs_buf.f_bavail;
-		*dsize = statvfs_buf.f_bsize * statvfs_buf.f_blocks;
+		*dfree = statvfs_buf.f_bavail;
+		*dsize = statvfs_buf.f_blocks;
+		disk_norm(small_query, bsize, dfree, dsize);
 		DEBUG(10, ("[CEPH] bsize: %llu, dfree: %llu, dsize: %llu\n",
 			llu(*bsize), llu(*dfree), llu(*dsize)));
 		return *dfree;


-- 
Samba Shared Repository