diff options
| -rw-r--r-- | xlators/protocol/client/src/client-handshake.c | 10 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client-lk.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c index 62877078b..496c48935 100644 --- a/xlators/protocol/client/src/client-handshake.c +++ b/xlators/protocol/client/src/client-handshake.c @@ -403,8 +403,8 @@ client3_1_reopen_cbk (struct rpc_req *req, struct iovec *iov, int count, local->loc.path, strerror (rsp.op_errno)); } else { gf_log (frame->this->name, GF_LOG_NORMAL, - "reopen on %s succeeded (%"PRId64")", - local->loc.path, rsp.op_ret, rsp.fd); + "reopen on %s succeeded (remote-fd = %"PRId64")", + local->loc.path, rsp.fd); } if (rsp.op_ret == -1) @@ -492,11 +492,11 @@ client3_1_reopendir_cbk (struct rpc_req *req, struct iovec *iov, int count, if (rsp.op_ret < 0) { gf_log (frame->this->name, GF_LOG_NORMAL, "reopendir on %s failed (%s)", - local->loc.path, rsp.op_ret, strerror (rsp.op_errno)); + local->loc.path, strerror (rsp.op_errno)); } else { gf_log (frame->this->name, GF_LOG_NORMAL, - "reopendir on %s succeeded (%"PRId64")", - local->loc.path, rsp.op_ret, rsp.fd); + "reopendir on %s succeeded (fd = %"PRId64")", + local->loc.path, rsp.fd); } if (-1 != rsp.op_ret) { diff --git a/xlators/protocol/client/src/client-lk.c b/xlators/protocol/client/src/client-lk.c index ee5952257..c018d5375 100644 --- a/xlators/protocol/client/src/client-lk.c +++ b/xlators/protocol/client/src/client-lk.c @@ -35,10 +35,10 @@ __dump_client_lock (client_posix_lock_t *lock) this = THIS; gf_log (this->name, GF_LOG_TRACE, - "{fd=%lld}" + "{fd=%p}" "{%s lk-owner:%"PRIu64" %"PRId64" - %"PRId64"}" "{start=%"PRId64" end=%"PRId64"}", - (unsigned long long)lock->fd, + lock->fd, lock->fl_type == F_WRLCK ? "Write-Lock" : "Read-Lock", lock->owner, lock->user_flock.l_start, @@ -581,7 +581,7 @@ construct_reserve_unlock (struct gf_flock *lock, call_frame_t *frame, lock->l_start = 0; lock->l_whence = SEEK_SET; lock->l_len = 0; /* Whole file */ - lock->l_pid = (uint64_t)frame->root; + lock->l_pid = (uint64_t)(unsigned long)frame->root; frame->root->lk_owner = client_lock->owner; |