diff options
| author | Nandaja Varma <nandaja.varma@gmail.com> | 2015-07-09 11:37:16 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2015-07-18 05:08:04 -0700 |
| commit | b2673ae923f3e4651f4c642a9b88f5d200a25585 (patch) | |
| tree | d756b502b6fd7f82feb67d53182f043d8aad02f0 /xlators/mgmt/glusterd/src/glusterd-locks.c | |
| parent | 0ad8bfb028d7916f7940bb48f0df616d164f74de (diff) | |
glusterd: Porting the left out gf_log_callingfns to new framework
Change-Id: I1b0ad54238895475ddbacc4fffacac8dc6e887fe
BUG: 1235538
Signed-off-by: Nandaja Varma <nandaja.varma@gmail.com>
Reviewed-on: http://review.gluster.org/11590
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-locks.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-locks.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-locks.c b/xlators/mgmt/glusterd/src/glusterd-locks.c index cbaa92d0bc6..e18bd239b89 100644 --- a/xlators/mgmt/glusterd/src/glusterd-locks.c +++ b/xlators/mgmt/glusterd/src/glusterd-locks.c @@ -536,7 +536,8 @@ glusterd_mgmt_v3_lock (const char *name, uuid_t uuid, uint32_t *op_errno, is_valid = glusterd_mgmt_v3_is_type_valid (type); if (is_valid != _gf_true) { - gf_log_callingfn (this->name, GF_LOG_ERROR, + gf_msg_callingfn (this->name, GF_LOG_ERROR, + EINVAL, GD_MSG_INVALID_ENTRY, "Invalid entity. Cannot perform locking " "operation on %s types", type); ret = -1; @@ -565,7 +566,8 @@ glusterd_mgmt_v3_lock (const char *name, uuid_t uuid, uint32_t *op_errno, /* If the lock has already been held for the given volume * we fail */ if (!gf_uuid_is_null (owner)) { - gf_log_callingfn (this->name, GF_LOG_WARNING, + gf_msg_callingfn (this->name, GF_LOG_WARNING, + 0, GD_MSG_LOCK_ALREADY_HELD, "Lock for %s held by %s", name, uuid_utoa (owner)); ret = -1; @@ -640,7 +642,8 @@ glusterd_mgmt_v3_unlock (const char *name, uuid_t uuid, char *type) is_valid = glusterd_mgmt_v3_is_type_valid (type); if (is_valid != _gf_true) { - gf_log_callingfn (this->name, GF_LOG_ERROR, + gf_msg_callingfn (this->name, GF_LOG_ERROR, EINVAL, + GD_MSG_INVALID_ENTRY, "Invalid entity. Cannot perform unlocking " "operation on %s types", type); ret = -1; @@ -668,7 +671,8 @@ glusterd_mgmt_v3_unlock (const char *name, uuid_t uuid, char *type) } if (gf_uuid_is_null (owner)) { - gf_log_callingfn (this->name, GF_LOG_WARNING, + gf_msg_callingfn (this->name, GF_LOG_WARNING, + 0, GD_MSG_LOCK_NOT_HELD, "Lock for %s %s not held", type, name); ret = -1; goto out; @@ -676,7 +680,8 @@ glusterd_mgmt_v3_unlock (const char *name, uuid_t uuid, char *type) ret = gf_uuid_compare (uuid, owner); if (ret) { - gf_log_callingfn (this->name, GF_LOG_WARNING, + gf_msg_callingfn (this->name, GF_LOG_WARNING, + 0, GD_MSG_LOCK_OWNER_MISMATCH, "Lock owner mismatch. " "Lock for %s %s held by %s", type, name, uuid_utoa (owner)); |