The branch, master has been updated via d27f00c vfs-btrfs: Fix build on 32 bit platforms by using long long types via c202dc9 Revert "vfs_btrfs: fix compile on 32-bit platforms." from 068e0e2 ntdb: don't call open hook when re-opening an existing database.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d27f00cd4cd14b7729861121ed221e3cf2ecf9ba Author: Andrew Bartlett <abart...@samba.org> Date: Wed Mar 20 12:46:22 2013 +1100 vfs-btrfs: Fix build on 32 bit platforms by using long long types Reviewed-by: Rusty Russell <ru...@rustcorp.com.au> Signed-off-by: Rusty Russell <ru...@rustcorp.com.au> Autobuild-User(master): Rusty Russell <ru...@rustcorp.com.au> Autobuild-Date(master): Sun Mar 24 06:17:55 CET 2013 on sn-devel-104 commit c202dc9705cf87542094ee1930e5dab9923c605b Author: Rusty Russell <ru...@rustcorp.com.au> Date: Sun Mar 24 13:58:02 2013 +1030 Revert "vfs_btrfs: fix compile on 32-bit platforms." This reverts commit fd6d0361d6fef5f8175967ddbae4a2b1d79dfcad. Unreviewed, and Andrew has a better fix. Signed-off-by: Rusty Russell <ru...@rustcorp.com.au> ----------------------------------------------------------------------- Summary of changes: source3/modules/vfs_btrfs.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_btrfs.c b/source3/modules/vfs_btrfs.c index eed5456..f854f2a 100644 --- a/source3/modules/vfs_btrfs.c +++ b/source3/modules/vfs_btrfs.c @@ -115,11 +115,14 @@ static struct tevent_req *btrfs_copy_chunk_send(struct vfs_handle_struct *handle * cloning. Which is 4096 by default, therefore fall back to * manual read/write on failure. */ - DEBUG(5, ("BTRFS_IOC_CLONE_RANGE failed: %s, length %lu, " - "src fd: %ld off: %lu, dest fd: %d off: %lu\n", - strerror(errno), (long)cr_args.src_length, - (long)cr_args.src_fd, (long)cr_args.src_offset, - dest_fsp->fh->fd, (long)cr_args.dest_offset)); + DEBUG(5, ("BTRFS_IOC_CLONE_RANGE failed: %s, length %llu, " + "src fd: %lld off: %llu, dest fd: %d off: %llu\n", + strerror(errno), + (unsigned long long)cr_args.src_length, + (long long)cr_args.src_fd, + (unsigned long long)cr_args.src_offset, + dest_fsp->fh->fd, + (unsigned long long)cr_args.dest_offset)); cc_state->subreq = SMB_VFS_NEXT_COPY_CHUNK_SEND(handle, cc_state, ev, src_fsp, @@ -177,8 +180,8 @@ static NTSTATUS btrfs_copy_chunk_recv(struct vfs_handle_struct *handle, return status; } - DEBUG(10, ("server side copy chunk copied %lu\n", - (long)cc_state->copied)); + DEBUG(10, ("server side copy chunk copied %llu\n", + (unsigned long long)cc_state->copied)); *copied = cc_state->copied; tevent_req_received(req); return NT_STATUS_OK; -- Samba Shared Repository