diff options
Diffstat (limited to 'api/src')
| -rw-r--r-- | api/src/gfapi-messages.h | 4 | ||||
| -rw-r--r-- | api/src/glfs-fops.c | 12 | ||||
| -rw-r--r-- | api/src/glfs-handleops.c | 8 | 
3 files changed, 13 insertions, 11 deletions
diff --git a/api/src/gfapi-messages.h b/api/src/gfapi-messages.h index fcf6f55d435..050b9766dea 100644 --- a/api/src/gfapi-messages.h +++ b/api/src/gfapi-messages.h @@ -40,7 +40,7 @@   */  #define GLFS_GFAPI_BASE             GLFS_MSGID_COMP_API -#define GLFS_NUM_MESSAGES           45 +#define GLFS_NUM_MESSAGES           47  #define GLFS_MSGID_END              (GLFS_GFAPI_BASE + GLFS_NUM_MESSAGESi + 1)  /* Messages with message IDs */  #define glfs_msg_start_x GLFS_GFAPI_BASE, "Invalid: Start of messages" @@ -92,6 +92,8 @@  #define API_MSG_VOLFILE_CONNECTING              (GLFS_GFAPI_BASE + 44)  #define API_MSG_NEW_GRAPH                       (GLFS_GFAPI_BASE + 45)  #define API_MSG_ALLOC_FAILED                    (GLFS_GFAPI_BASE + 46) +#define API_MSG_CREATE_HANDLE_FAILED            (GLFS_GFAPI_BASE + 47) +  /*------------*/  #define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages" diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c index ff85f7b8322..4988137f363 100644 --- a/api/src/glfs-fops.c +++ b/api/src/glfs-fops.c @@ -3803,8 +3803,8 @@ priv_glfs_process_upcall_event (struct glfs *fs, void *data)          glusterfs_ctx_t    *ctx            = NULL;          struct gf_upcall   *upcall_data    = NULL; -        gf_log (THIS->name, GF_LOG_DEBUG, -                "Upcall gfapi callback is called"); +        gf_msg_debug (THIS->name, 0, +                      "Upcall gfapi callback is called");          if (!fs || !data)                  goto out; @@ -3829,15 +3829,15 @@ priv_glfs_process_upcall_event (struct glfs *fs, void *data)          upcall_data = (struct gf_upcall *)data; -        gf_log (THIS->name, GF_LOG_TRACE, "Upcall gfapi gfid = %s" -                "ret = %d", (char *)(upcall_data->gfid), ret); +        gf_msg_trace (THIS->name, 0, "Upcall gfapi gfid = %s" +                      "ret = %d", (char *)(upcall_data->gfid), ret);          u_list = GF_CALLOC (1, sizeof(*u_list),                              glfs_mt_upcall_entry_t);          if (!u_list) { -                gf_log (THIS->name, GF_LOG_ERROR, "Upcall entry allocation" -                        "failed."); +                gf_msg (THIS->name, GF_LOG_ERROR, ENOMEM, API_MSG_ALLOC_FAILED, +                        "Upcall entry allocation failed.");                  goto out;          } diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c index 79085ff33a1..0f201a2b99d 100644 --- a/api/src/glfs-handleops.c +++ b/api/src/glfs-handleops.c @@ -1938,10 +1938,10 @@ pub_glfs_h_poll_upcall (struct glfs *fs, struct callback_arg *up_arg)                           *                           * Applications will ignore this notification                           * as up_arg->object will be NULL */ -                        gf_log (subvol->name, GF_LOG_WARNING, -                                "handle creation of %s failed: %s", -                                uuid_utoa (upcall_data->gfid), -                                strerror (errno)); +                        gf_msg (subvol->name, GF_LOG_WARNING, errno, +                                API_MSG_CREATE_HANDLE_FAILED, +                                "handle creation of %s failed", +                                uuid_utoa (upcall_data->gfid));                          reason = GFAPI_CBK_EVENT_NULL;                          break;  | 
