diff options
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/features/snapview-server/src/snapview-server.c | 8 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-snapshot.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.c | 2 | ||||
| -rw-r--r-- | xlators/storage/posix/src/posix-entry-ops.c | 2 | 
4 files changed, 7 insertions, 9 deletions
diff --git a/xlators/features/snapview-server/src/snapview-server.c b/xlators/features/snapview-server/src/snapview-server.c index 52273c995c7..ad5c2baad12 100644 --- a/xlators/features/snapview-server/src/snapview-server.c +++ b/xlators/features/snapview-server/src/snapview-server.c @@ -997,8 +997,8 @@ svs_getxattr(call_frame_t *frame, xlator_t *this, loc_t *loc, const char *name,                  op_errno = ENOMEM;                  gf_msg(this->name, GF_LOG_ERROR, op_errno, SVS_MSG_NO_MEMORY,                         "failed to add xattrs from the list to " -                       "dict for %s (gfid: %s, key: %s)", -                       loc->path, uuid_utoa(loc->inode->gfid), name); +                       "dict for %s (gfid: %s)", +                       loc->path, uuid_utoa(loc->inode->gfid));                  goto out;              }              GF_FREE(value); @@ -1179,8 +1179,8 @@ svs_fgetxattr(call_frame_t *frame, xlator_t *this, fd_t *fd, const char *name,                  op_errno = ENOMEM;                  gf_msg(this->name, GF_LOG_ERROR, op_errno, SVS_MSG_NO_MEMORY,                         "failed to add xattrs from the list " -                       "to dict (gfid: %s, key: %s)", -                       uuid_utoa(fd->inode->gfid), name); +                       "to dict (gfid: %s)", +                       uuid_utoa(fd->inode->gfid));                  goto out;              }              GF_FREE(value); diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c index ec630d55469..e8e342b6f6c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c +++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c @@ -7709,7 +7709,6 @@ glusterd_snapshot_status_commit(dict_t *dict, char **op_errstr,      xlator_t *this = NULL;      int ret = -1;      glusterd_conf_t *conf = NULL; -    char *get_buffer = NULL;      int32_t cmd = -1;      char *snapname = NULL;      glusterd_snap_t *snap = NULL; @@ -7778,8 +7777,7 @@ glusterd_snapshot_status_commit(dict_t *dict, char **op_errstr,              if (ret) {                  gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_SNAP_STATUS_FAIL,                         "Unable to " -                       "get status of snap %s", -                       get_buffer); +                       "get status of snap");                  goto out;              } diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index 6d7dd4a82d5..131a3c2b7f2 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -1085,7 +1085,7 @@ err:      gf_msg("glusterd", GF_LOG_ERROR, 0, GD_MSG_MOUNT_SPEC_INSTALL_FAIL,             "adding %smount spec failed: label: %s desc: %s", -           georep ? GEOREP " " : "", label, pdesc); +           georep ? GEOREP " " : "", label, pdesc ? pdesc : "");      if (mspec) {          if (mspec->patterns) { diff --git a/xlators/storage/posix/src/posix-entry-ops.c b/xlators/storage/posix/src/posix-entry-ops.c index aab88f0d20a..3c070de3929 100644 --- a/xlators/storage/posix/src/posix-entry-ops.c +++ b/xlators/storage/posix/src/posix-entry-ops.c @@ -890,7 +890,7 @@ posix_add_unlink_to_ctx(inode_t *inode, xlator_t *this, char *unlink_path)      if (!unlink_path) {          gf_msg(this->name, GF_LOG_ERROR, ENOMEM, P_MSG_UNLINK_FAILED, -               "Creation of unlink entry failed for gfid: %s", unlink_path); +               "Creation of unlink entry failed");          ret = -1;          goto out;      }  | 
