[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  92d87e1 s3/vfs_tsmsm: remove unneeded cast to off_t
       via  d5d08d3 s3/vfs_tsmsm: fix debug output for large files
      from  0b3180b ldb: error out when modules are not found

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


- Log -----------------------------------------------------------------
commit 92d87e1f677207f9cd8d279168227d216d58ab46
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Nov 17 17:52:06 2010 +0100

    s3/vfs_tsmsm: remove unneeded cast to off_t
    
    "off_t" is wrong on 32 bit systems anyhow ...
    
    Autobuild-User: Björn Jacke <bj at sernet.de>
    Autobuild-Date: Thu Nov 18 14:47:59 UTC 2010 on sn-devel-104

commit d5d08d3b50592f8950ab68c654b2116e704d0f30
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Nov 17 17:45:01 2010 +0100

    s3/vfs_tsmsm: fix debug output for large files

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

Summary of changes:
 source3/modules/vfs_tsmsm.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_tsmsm.c b/source3/modules/vfs_tsmsm.c
index 12f79ff..95c83de 100644
--- a/source3/modules/vfs_tsmsm.c
+++ b/source3/modules/vfs_tsmsm.c
@@ -161,12 +161,12 @@ static bool tsmsm_is_offline(struct vfs_handle_struct *handle,
 
         /* if the file has more than FILE_IS_ONLINE_RATIO of blocks available,
 	   then assume it is not offline (it may not be 100%, as it could be sparse) */
-	if (512 * (off_t)stbuf->st_ex_blocks >=
+	if (512 * stbuf->st_ex_blocks >=
 	    stbuf->st_ex_size * tsmd->online_ratio) {
-		DEBUG(10,("%s not offline: st_blocks=%ld st_size=%ld "
+		DEBUG(10,("%s not offline: st_blocks=%llu st_size=%llu "
 			  "online_ratio=%.2f\n", path,
-			  (long)stbuf->st_ex_blocks,
-			  (long)stbuf->st_ex_size, tsmd->online_ratio));
+			  (unsigned long long)stbuf->st_ex_blocks,
+			  (unsigned long long)stbuf->st_ex_size, tsmd->online_ratio));
 		return false;
 	}
 
@@ -263,10 +263,10 @@ static bool tsmsm_aio_force(struct vfs_handle_struct *handle, struct files_struc
 	   if the file might be offline
 	*/
 	if(SMB_VFS_FSTAT(fsp, &sbuf) == 0) {
-		DEBUG(10,("tsmsm_aio_force st_blocks=%ld st_size=%ld "
-			  "online_ratio=%.2f\n", (long)sbuf.st_ex_blocks,
-			  (long)sbuf.st_ex_size, tsmd->online_ratio));
-		return !(512 * (off_t)sbuf.st_ex_blocks >=
+		DEBUG(10,("tsmsm_aio_force st_blocks=%llu st_size=%llu "
+			  "online_ratio=%.2f\n", (unsigned long long)sbuf.st_ex_blocks,
+			  (unsigned long long)sbuf.st_ex_size, tsmd->online_ratio));
+		return !(512 * sbuf.st_ex_blocks >=
 			 sbuf.st_ex_size * tsmd->online_ratio);
 	}
 	return false;


-- 
Samba Shared Repository