[SCM] Samba Shared Repository - branch master updated

[David Disseldorp]

The branch, master has been updated
       via  bf33239 Fix warnings and one compile error caused by newer gcc 4.7.
      from  0a29101 idmap: Store negative cache entries if the backend fails

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


- Log -----------------------------------------------------------------
commit bf332392e15e4a2b8799101e3ddae194dca36d13
Author: Jeremy Allison <jra at samba.org>
Date:   Fri May 3 10:06:39 2013 -0700

    Fix warnings and one compile error caused by newer gcc 4.7.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Sun May  5 19:01:38 CEST 2013 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index fdb7feb..e402ff1 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -236,8 +236,8 @@ static int cephwrap_statvfs(struct vfs_handle_struct *handle,  const char *path,
 		statbuf->FreeFileNodes = statvfs_buf.f_ffree;
 		statbuf->FsIdentifier = statvfs_buf.f_fsid;
 		DEBUG(10, ("[CEPH] f_bsize: %ld, f_blocks: %ld, f_bfree: %ld, f_bavail: %ld\n",
-			statvfs_buf.f_bsize, statvfs_buf.f_blocks,
-			statvfs_buf.f_bfree, statvfs_buf.f_bavail));
+			(long int)statvfs_buf.f_bsize, (long int)statvfs_buf.f_blocks,
+			(long int)statvfs_buf.f_bfree, (long int)statvfs_buf.f_bavail));
 	}
 	return ret;
 }
@@ -1091,6 +1091,7 @@ static ssize_t cephwrap_listxattr(struct vfs_handle_struct *handle, const char *
 	}
 }
 
+#if 0
 static ssize_t cephwrap_llistxattr(struct vfs_handle_struct *handle, const char *path, char *list, size_t size)
 {
 	DEBUG(10, ("[CEPH] llistxattr(%p, %s, %p, %llu)\n", handle, path, list, llu(size)));
@@ -1102,12 +1103,13 @@ static ssize_t cephwrap_llistxattr(struct vfs_handle_struct *handle, const char
 		return (ssize_t)ret;
 	}
 }
+#endif
 
 static ssize_t cephwrap_flistxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, char *list, size_t size)
 {
 	DEBUG(10, ("[CEPH] flistxattr(%p, %p, %s, %llu)\n", handle, fsp, list, llu(size)));
 	int ret = ceph_listxattr(handle->data, fsp->fsp_name->base_name, list, size);
-	DEBUG(10, ("[CEPH] flistxattr(...)\n", ret));
+	DEBUG(10, ("[CEPH] flistxattr(...) = %d\n", ret));
 	if (ret < 0) {
 		WRAP_RETURN(ret);
 	} else {


-- 
Samba Shared Repository