Cluster/DHT : Logging changes

Removed trailing spaces from the code

Change-Id: I427c9a01b514824f903e301863c2c29071db6483
BUG: 1075611
Signed-off-by: Nithya Balachandran <nbalacha@redhat.com>
Reviewed-on: http://review.gluster.org/8096
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>

7 files changed, 40 insertions, 50 deletions

diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
index 73d58d853b2..72ec641cce1 100644
--- a/xlators/cluster/dht/src/dht-common.c
+++ b/xlators/cluster/dht/src/dht-common.c
@@ -1196,7 +1196,7 @@ dht_lookup_linkfile_cbk (call_frame_t *frame, void *cookie,
         if (op_ret == -1) {
                 gf_log (this->name, GF_LOG_INFO,
                         "Lookup of %s on %s (following linkfile) failed (%s)"
-                        ",gfid = %s", local->loc.path, subvol->name, 
+                        ",gfid = %s", local->loc.path, subvol->name,
                         strerror (op_errno), gfid);
 
                 /* If cached subvol returned ENOTCONN, do not do
@@ -1733,8 +1733,7 @@ dht_unlink_linkfile_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         gf_msg_debug (this->name, 0,
                                       "Unlink link: subvolume %s"
                                       " returned -1 (%s)",
-                                      prev->this->name, 
-                                      strerror (op_errno));
+                                      prev->this->name, strerror (op_errno));
                         goto unlock;
                 }
 
@@ -1784,8 +1783,7 @@ dht_err_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->op_errno = op_errno;
                         gf_msg_debug (this->name, 0,
                                       "subvolume %s returned -1 (%s)",
-                                      prev->this->name, 
-                                      strerror (op_errno));
+                                      prev->this->name, strerror (op_errno));
                         goto unlock;
                 }
 
@@ -2030,9 +2028,9 @@ dht_vgetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         if (op_ret < 0) {
                 local->op_ret = -1;
                 local->op_errno = op_errno;
-                gf_log (this->name, GF_LOG_ERROR, 
-                        "vgetxattr: Subvolume %s returned -1 "
-                        "(%s)", prev->this->name, strerror (op_errno));
+                gf_log (this->name, GF_LOG_ERROR,
+                        "vgetxattr: Subvolume %s returned -1 (%s)",
+                         prev->this->name, strerror (op_errno));
                 goto unwind;
         }
 
@@ -2299,7 +2297,7 @@ dht_getxattr (call_frame_t *frame, xlator_t *this,
                 if (!hashed_subvol) {
                         gf_msg (this->name, GF_LOG_ERROR, 0,
                                 DHT_MSG_HASHED_SUBVOL_GET_FAILED,
-                                "Failed to get hashed subvol for %s", 
+                                "Failed to get hashed subvol for %s",
                                 loc->path);
                         op_errno = EINVAL;
                         goto err;
@@ -2309,7 +2307,7 @@ dht_getxattr (call_frame_t *frame, xlator_t *this,
                 if (!cached_subvol) {
                         gf_msg (this->name, GF_LOG_ERROR, 0,
                                 DHT_MSG_CACHED_SUBVOL_GET_FAILED,
-                                "Failed to get cached subvol for %s", 
+                                "Failed to get cached subvol for %s",
                                 loc->path);
                         op_errno = EINVAL;
                         goto err;
@@ -2614,7 +2612,7 @@ dht_setxattr (call_frame_t *frame, xlator_t *this,
         subvol = local->cached_subvol;
         if (!subvol) {
                 gf_msg_debug (this->name, 0,
-                              "no cached subvolume for path=%s", 
+                              "no cached subvolume for path=%s",
                               loc->path);
                 op_errno = EINVAL;
                 goto err;
@@ -2651,7 +2649,7 @@ dht_setxattr (call_frame_t *frame, xlator_t *this,
                 if (!local->rebalance.target_node) {
                         gf_msg (this->name, GF_LOG_ERROR, 0,
                                 DHT_MSG_HASHED_SUBVOL_GET_FAILED,
-                                "Failed to get hashed subvol for %s", 
+                                "Failed to get hashed subvol for %s",
                                 loc->path);
                         op_errno = EINVAL;
                         goto err;
@@ -2774,8 +2772,7 @@ dht_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->op_errno = op_errno;
                         gf_msg_debug (this->name, 0,
                                       "subvolume %s returned -1 (%s)",
-                                      prev->this->name, 
-                                      strerror (op_errno));
+                                      prev->this->name, strerror (op_errno));
                         goto unlock;
                 }
 
@@ -2826,8 +2823,7 @@ dht_removexattr (call_frame_t *frame, xlator_t *this,
         subvol = local->cached_subvol;
         if (!subvol) {
                 gf_msg_debug (this->name, 0,
-                              "no cached subvolume for path=%s", 
-                              loc->path);
+                              "no cached subvolume for path=%s", loc->path);
                 op_errno = EINVAL;
                 goto err;
         }
@@ -2899,7 +2895,7 @@ dht_fremovexattr (call_frame_t *frame, xlator_t *this,
         layout = local->layout;
         if (!local->layout) {
                 gf_msg_debug (this->name, 0,
-                              "no layout for inode=%s", 
+                              "no layout for inode=%s",
                               uuid_utoa (fd->inode->gfid));
                 op_errno = EINVAL;
                 goto err;
@@ -3138,8 +3134,7 @@ dht_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata)
         subvol = dht_subvol_get_cached (this, loc->inode);
         if (!subvol) {
                 gf_msg_debug (this->name, 0,
-                              "no cached subvolume for path=%s", 
-                              loc->path);
+                              "no cached subvolume for path=%s", loc->path);
                 op_errno = EINVAL;
                 goto err;
         }
@@ -3818,7 +3813,7 @@ dht_mknod (call_frame_t *frame, xlator_t *this,
                                              this, avail_subvol, subvol, loc);
                 } else {
                         gf_msg_trace (this->name, 0,
-                                      "creating %s on %s", loc->path, 
+                                      "creating %s on %s", loc->path,
                                       subvol->name);
 
                         STACK_WIND_COOKIE (frame, dht_newfile_cbk,
@@ -4053,8 +4048,7 @@ dht_link (call_frame_t *frame, xlator_t *this,
         cached_subvol = local->cached_subvol;
         if (!cached_subvol) {
                 gf_msg_debug (this->name, 0,
-                              "no cached subvolume for path=%s", 
-                              oldloc->path);
+                              "no cached subvolume for path=%s", oldloc->path);
                 op_errno = ENOENT;
                 goto err;
         }
@@ -4218,7 +4212,7 @@ dht_create (call_frame_t *frame, xlator_t *this,
 
         if (!dht_is_subvol_filled (this, subvol)) {
                 gf_msg_trace (this->name, 0,
-                              "creating %s on %s", loc->path, 
+                              "creating %s on %s", loc->path,
                                subvol->name);
                 STACK_WIND (frame, dht_create_cbk,
                             subvol, subvol->fops->create,
@@ -4533,7 +4527,7 @@ dht_rmdir_hashed_subvol_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         gf_msg_debug (this->name, 0,
                                       "rmdir on %s for %s failed "
                                       "(gfid = %s) (%s)",
-                                      prev->this->name, local->loc.path, 
+                                      prev->this->name, local->loc.path,
                                       gfid, strerror (op_errno));
                         goto unlock;
                 }
@@ -5011,7 +5005,7 @@ dht_rmdir_is_subvol_empty (call_frame_t *frame, xlator_t *this,
                 if (!subvol) {
                         gf_log (this->name, GF_LOG_INFO,
                                 "Linkfile does not have link subvolume. "
-                                "path = %s, gfid = %s", 
+                                "path = %s, gfid = %s",
                                 lookup_local->loc.path, gfid);
                         STACK_WIND (lookup_frame, dht_rmdir_lookup_cbk,
                                     src, src->fops->lookup,
@@ -5059,7 +5053,7 @@ dht_rmdir_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                 case 0: /* non linkfiles exist */
                         gf_msg_trace (this->name, 0,
                                       "readdir on %s for %s returned %d "
-                                      "entries", prev->this->name, 
+                                      "entries", prev->this->name,
                                       local->loc.path, op_ret);
                         local->op_ret = -1;
                         local->op_errno = ENOTEMPTY;
@@ -5068,7 +5062,7 @@ dht_rmdir_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         /* @ret number of linkfiles are getting unlinked */
                         gf_msg_trace (this->name, 0,
                                       "readdir on %s for %s found %d "
-                                      "linkfiles", prev->this->name, 
+                                      "linkfiles", prev->this->name,
                                       local->loc.path, ret);
                         break;
                 }
diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c
index 7f0748a07cc..7c24947787d 100644
--- a/xlators/cluster/dht/src/dht-helper.c
+++ b/xlators/cluster/dht/src/dht-helper.c
@@ -833,7 +833,7 @@ dht_migration_complete_check_task (void *data)
         if (ret != 0) {
                 gf_msg_debug (this->name, 0,
                               "%s: could not set preset layout "
-                              "for subvol %s", local->loc.path, 
+                              "for subvol %s", local->loc.path,
                               dst_node->name);
                 ret   = -1;
                 local->op_errno = EINVAL;
diff --git a/xlators/cluster/dht/src/dht-inode-read.c b/xlators/cluster/dht/src/dht-inode-read.c
index aac402a2a42..9a7b3e22354 100644
--- a/xlators/cluster/dht/src/dht-inode-read.c
+++ b/xlators/cluster/dht/src/dht-inode-read.c
@@ -235,8 +235,7 @@ dht_attr_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         local->op_errno = op_errno;
                         gf_msg_debug (this->name, 0,
                                       "subvolume %s returned -1 (%s)",
-                                      prev->this->name, 
-                                      strerror (op_errno));
+                                      prev->this->name, strerror (op_errno));
 
                         goto unlock;
                 }
@@ -600,8 +599,7 @@ dht_access (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t mask,
         subvol = local->cached_subvol;
         if (!subvol) {
                 gf_msg_debug (this->name, 0,
-                              "no cached subvolume for path=%s", 
-                              loc->path);
+                              "no cached subvolume for path=%s", loc->path);
                 op_errno = EINVAL;
                 goto err;
         }
@@ -977,8 +975,7 @@ dht_xattrop (call_frame_t *frame, xlator_t *this, loc_t *loc,
         subvol = local->cached_subvol;
         if (!subvol) {
                 gf_msg_debug (this->name, 0,
-                              "no cached subvolume for path=%s", 
-                              loc->path);
+                              "no cached subvolume for path=%s", loc->path);
                 op_errno = EINVAL;
                 goto err;
         }
@@ -1077,8 +1074,7 @@ dht_inodelk (call_frame_t *frame, xlator_t *this, const char *volume,
         subvol = local->cached_subvol;
         if (!subvol) {
                 gf_msg_debug (this->name, 0,
-                              "no cached subvolume for path=%s", 
-                              loc->path);
+                              "no cached subvolume for path=%s", loc->path);
                 op_errno = EINVAL;
                 goto err;
         }
diff --git a/xlators/cluster/dht/src/dht-linkfile.c b/xlators/cluster/dht/src/dht-linkfile.c
index 3daa3c60713..90892a8a9bd 100644
--- a/xlators/cluster/dht/src/dht-linkfile.c
+++ b/xlators/cluster/dht/src/dht-linkfile.c
@@ -44,7 +44,7 @@ dht_linkfile_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         is_linkfile = check_is_linkfile (inode, stbuf, xattr,
                                          conf->link_xattr_name);
         if (!is_linkfile)
-                gf_log (this->name, GF_LOG_WARNING, 
+                gf_log (this->name, GF_LOG_WARNING,
                         "got non-linkfile %s:%s, gfid = %s",
                         prev->this->name, local->loc.path, gfid);
 out:
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index 888f32ac379..9cdb4453820 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -209,7 +209,7 @@ gf_defrag_handle_hardlink (xlator_t *this, loc_t *loc, dict_t  *xattrs,
                                 DHT_MSG_MIGRATE_FILE_FAILED,
                                 "Migrate file failed :"
                                 "Failed to set dictionary value:"
-                                " key = %s for %s", 
+                                " key = %s for %s",
                                 conf->link_xattr_name, loc->name);
                         goto out;
                 }
@@ -219,7 +219,7 @@ gf_defrag_handle_hardlink (xlator_t *this, loc_t *loc, dict_t  *xattrs,
                         gf_msg (this->name, GF_LOG_ERROR, 0,
                                 DHT_MSG_MIGRATE_FILE_FAILED,
                                 "Migrate file failed :"
-                                "Linkto setxattr failed %s -> %s (%s)", 
+                                "Linkto setxattr failed %s -> %s (%s)",
                                 cached_subvol->name,
                                 loc->name, strerror (-ret));
                         ret = -1;
@@ -1002,7 +1002,7 @@ dht_migrate_file (xlator_t *this, loc_t *loc, xlator_t *from, xlator_t *to,
                               (GF_SET_ATTR_MTIME | GF_SET_ATTR_ATIME),
                               NULL, NULL);
         if (ret) {
-                gf_log (this->name, GF_LOG_WARNING, 
+                gf_log (this->name, GF_LOG_WARNING,
                         "%s: failed to perform setattr on %s ",
                         loc->path, to->name);
                 ret = -1;
@@ -1423,7 +1423,7 @@ gf_defrag_migrate_data (xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc,
                                 gf_msg (this->name, GF_LOG_ERROR, 0,
                                         DHT_MSG_MIGRATE_FILE_FAILED,
                                         "Migrate file failed:"
-                                        "Failed to get node-uuid for %s", 
+                                        "Failed to get node-uuid for %s",
                                         entry_loc.path);
                                 ret = -1;
                                 continue;
@@ -1450,7 +1450,7 @@ gf_defrag_migrate_data (xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc,
                          */
                         if (uuid_compare (node_uuid, defrag->node_uuid)) {
                                 gf_msg_trace (this->name, 0, "%s does not"
-                                              "belong to this node", 
+                                              "belong to this node",
                                               entry_loc.path);
                                 continue;
                         }
@@ -1716,7 +1716,7 @@ gf_defrag_fix_layout (xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc,
                         if (ret) {
                                 gf_msg (this->name, GF_LOG_ERROR, 0,
                                         DHT_MSG_LAYOUT_FIX_FAILED,
-                                        "Fix layout failed for %s", 
+                                        "Fix layout failed for %s",
                                         entry_loc.path);
                                 defrag->total_failures++;
                                 goto out;
diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c
index 9b440a7690b..3120db218eb 100644
--- a/xlators/cluster/dht/src/dht-rename.c
+++ b/xlators/cluster/dht/src/dht-rename.c
@@ -459,7 +459,7 @@ dht_rename_cleanup (call_frame_t *frame)
 
                 gf_msg_trace (this->name, 0,
                               "unlinking linkfile %s @ %s => %s, (gfid = %s)",
-                              local->loc.path, dst_hashed->name, 
+                              local->loc.path, dst_hashed->name,
                               src_cached->name, gfid);
 
                 xattr_new = dict_copy_with_ref (xattr, NULL);
@@ -479,8 +479,8 @@ dht_rename_cleanup (call_frame_t *frame)
                 dict_t *xattr_new = NULL;
 
                 gf_msg_trace (this->name, 0,
-                              "unlinking link %s => %s (%s), (gfid = %s)", 
-                              local->loc.path, local->loc2.path, 
+                              "unlinking link %s => %s (%s), (gfid = %s)",
+                              local->loc.path, local->loc2.path,
                               src_cached->name, gfid);
 
                 xattr_new = dict_copy_with_ref (xattr, NULL);
@@ -579,7 +579,7 @@ dht_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         if (op_ret == -1) {
                 gf_msg (this->name, GF_LOG_WARNING, op_errno,
                         DHT_MSG_RENAME_FAILED,
-                        "%s: Rename on %s failed, (gfid = %s) ", 
+                        "%s: Rename on %s failed, (gfid = %s) ",
                         local->loc.path, prev->this->name,
                         local->loc.inode? uuid_utoa(local->loc.inode->gfid):"");
                 local->op_ret   = op_ret;
diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c
index 53082c505ff..4748d2a4f61 100644
--- a/xlators/cluster/dht/src/dht-shared.c
+++ b/xlators/cluster/dht/src/dht-shared.c
@@ -461,7 +461,7 @@ gf_defrag_pattern_list_fill (xlator_t *this, gf_defrag_info_t *defrag, char *dat
                                 pattern = "*";
                         }
                 } else if (gf_string2bytesize_uint64 (num, &pattern_list->size) != 0) {
-                        gf_msg (this->name, GF_LOG_ERROR, 0, 
+                        gf_msg (this->name, GF_LOG_ERROR, 0,
                                 DHT_MSG_INVALID_OPTION,
                                 "Invalid option. Defrag pattern:"
                                 " Invalid number format \"%s\"", num);
@@ -597,9 +597,9 @@ dht_init (xlator_t *this)
                         if (gf_defrag_pattern_list_fill (this, defrag, temp_str)
                             == -1) {
                                 gf_msg (this->name, GF_LOG_ERROR, 0,
-                                        DHT_MSG_INVALID_OPTION, 
+                                        DHT_MSG_INVALID_OPTION,
                                         "Invalid option:"
-                                        " Cannot parse rebalance-filter (%s)", 
+                                        " Cannot parse rebalance-filter (%s)",
                                         temp_str);
 
                                 goto err;