diff options
| -rw-r--r-- | libglusterfs/src/common-utils.c | 2 | ||||
| -rw-r--r-- | libglusterfs/src/logging.c | 14 |
2 files changed, 6 insertions, 10 deletions
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c index 32c15637f03..fb6948d2d86 100644 --- a/libglusterfs/src/common-utils.c +++ b/libglusterfs/src/common-utils.c @@ -207,6 +207,7 @@ gf_global_variable_init() gf_fop_list[GF_FOP_FENTRYLK] = "FENTRYLK"; /* 40 */ gf_fop_list[GF_FOP_CHECKSUM] = "CHECKSUM"; /* 41 */ gf_fop_list[GF_FOP_XATTROP] = "XATTROP"; + gf_fop_list[GF_FOP_FXATTROP] = "FXATTROP"; gf_fop_list[GF_FOP_LOCK_NOTIFY] = "LOCK_NOTIFY"; gf_fop_list[GF_FOP_LOCK_FNOTIFY]= "LOCK_FNOTIFY"; gf_fop_list[GF_FOP_FSETXATTR] = "FSETXATTR"; @@ -217,6 +218,7 @@ gf_global_variable_init() gf_mop_list[GF_MOP_STATS] = "STATS"; gf_mop_list[GF_MOP_SETSPEC] = "SETSPEC"; gf_mop_list[GF_MOP_GETSPEC] = "GETSPEC"; + gf_mop_list[GF_MOP_PING] = "PING"; gf_cbk_list[GF_CBK_FORGET] = "FORGET"; gf_cbk_list[GF_CBK_RELEASE] = "RELEASE"; diff --git a/libglusterfs/src/logging.c b/libglusterfs/src/logging.c index 53311ac7924..6f4eb1fb7ec 100644 --- a/libglusterfs/src/logging.c +++ b/libglusterfs/src/logging.c @@ -190,16 +190,10 @@ log: else basename = file; - if (level >= GF_LOG_DEBUG) { - fprintf (logfile, "[%s] %s [%s:%d:%s] %s: ", - timestr, level_strings[level], - basename, line, function, - domain); - } else { - fprintf (logfile, "[%s] %s %s: ", - timestr, level_strings[level], - domain); - } + fprintf (logfile, "[%s] %s [%s:%d:%s] %s: ", + timestr, level_strings[level], + basename, line, function, + domain); vfprintf (logfile, fmt, ap); va_end (ap); |