From bf332392e15e4a2b8799101e3ddae194dca36d13 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 3 May 2013 10:06:39 -0700 Subject: Fix warnings and one compile error caused by newer gcc 4.7. Signed-off-by: Jeremy Allison Reviewed-by: David Disseldorp Autobuild-User(master): David Disseldorp Autobuild-Date(master): Sun May 5 19:01:38 CEST 2013 on sn-devel-104 --- source3/modules/vfs_ceph.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source3/modules') diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c index fdb7feb44f..e402ff1141 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 { -- cgit