[SCM] CTDB repository - branch master updated - ctdb-1.13-341-gcd64035

[Amitay Isaacs]

The branch, master has been updated
       via  cd64035d71ddff6aebe6c15a49e09527283425d2 (commit)
      from  ceac026713a7ee30ea865ed4a9422900ed76fdf6 (commit)

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


- Log -----------------------------------------------------------------
commit cd64035d71ddff6aebe6c15a49e09527283425d2
Author: Martin Schwenke <mar...@meltin.net>
Date:   Wed Oct 31 12:33:25 2012 +1100

    ctdbd: Fix compilation warning in locking code
    
    Signed-off-by: Martin Schwenke <mar...@meltin.net>

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

Summary of changes:
 server/ctdb_lock.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_lock.c b/server/ctdb_lock.c
index 8097e84..81f0eb3 100644
--- a/server/ctdb_lock.c
+++ b/server/ctdb_lock.c
@@ -1039,13 +1039,13 @@ void ctdb_lock_blocked_handler(struct tevent_context 
*ev,
                DEBUG(DEBUG_WARNING,
                      ("Process %s (pid=%d) locked database %s (inode %lu) for 
%.0lf seconds\n",
                       (process_name ? process_name : "unknown"),
-                      blocker_pid, db_name, inode,
+                      blocker_pid, db_name, (unsigned long)inode,
                       timeval_elapsed(&lock_ctx->start_time)));
        } else {
                DEBUG(DEBUG_WARNING,
                      ("Process %s (pid=%d) locked database (inode %lu) for 
%.0lf seconds\n",
                       (process_name ? process_name : "unknown"),
-                      blocker_pid, inode,
+                      blocker_pid, (unsigned long)inode,
                       timeval_elapsed(&lock_ctx->start_time)));
        }
 


-- 
CTDB repository