diff --git a/daemons/clvmd/clvmd-openais.c b/daemons/clvmd/clvmd-openais.c
index a2fe69e28..5f237e9b0 100644
--- a/daemons/clvmd/clvmd-openais.c
+++ b/daemons/clvmd/clvmd-openais.c
@@ -506,7 +506,7 @@ static int _lock_resource(char *resource, int mode, int flags, int *lockid)
 		saLckResourceClose(res_handle);
 		return ais_to_errno(err);
 	}
-			
+
 	/* Wait for it to complete */
 
 	DEBUGLOG("lock_resource returning %d, lock_id=%" PRIx64 "\n",
diff --git a/daemons/cmirrord/cluster.c b/daemons/cmirrord/cluster.c
index f7b43b55b..0a782401e 100644
--- a/daemons/cmirrord/cluster.c
+++ b/daemons/cmirrord/cluster.c
@@ -89,7 +89,7 @@ struct checkpoint_data {
 	char *clean_bits;
 	char *recovering_region;
 	struct checkpoint_data *next;
-};	
+};
 
 #define INVALID 0
 #define VALID   1
@@ -911,9 +911,9 @@ static int resend_requests(struct clog_cpg *entry)
 
 			rq->u_rq.data_size = 0;
 			kernel_send(&rq->u_rq);
-				
+
 			break;
-			
+
 		default:
 			/*
 			 * If an action or a response is required, then
@@ -1355,7 +1355,7 @@ static void cpg_leave_callback(struct clog_cpg *match,
 		match->free_me = 1;
 		match->lowest_id = 0xDEAD;
 		match->state = INVALID;
-	}			
+	}
 
 	/* Remove any pending checkpoints for the leaving node. */
 	for (p_cp = NULL, c_cp = match->checkpoint_list;
@@ -1411,7 +1411,7 @@ static void cpg_leave_callback(struct clog_cpg *match,
 			 left->nodeid);
 		return;
 	}
-		
+
 	match->lowest_id = member_list[0].nodeid;
 	for (i = 0; i < member_list_entries; i++)
 		if (match->lowest_id > member_list[i].nodeid)
@@ -1530,7 +1530,7 @@ unlink_retry:
                 usleep(1000);
                 goto unlink_retry;
         }
-	
+
 	if (rv != SA_AIS_OK) {
                 LOG_ERROR("[%s] Failed to unlink checkpoint: %s",
                           SHORT_UUID(entry->name.value), str_ais_error(rv));
@@ -1633,7 +1633,7 @@ static int _destroy_cluster_cpg(struct clog_cpg *del)
 {
 	int r;
 	int state;
-	
+
 	LOG_COND(log_resend_requests, "[%s] I am leaving.2.....",
 		 SHORT_UUID(del->name.value));
 
diff --git a/daemons/cmirrord/functions.c b/daemons/cmirrord/functions.c
index b8689b483..96f7b8eb6 100644
--- a/daemons/cmirrord/functions.c
+++ b/daemons/cmirrord/functions.c
@@ -784,7 +784,7 @@ static int clog_resume(struct dm_ulog_request *rq)
 		else if (lc->disk_nr_regions > lc->region_count)
 			LOG_DBG("[%s] Mirror has shrunk, updating log bits",
 				SHORT_UUID(lc->uuid));
-		break;		
+		break;
 	case -EINVAL:
 		LOG_DBG("[%s] (Re)initializing mirror log - resync issued.",
 			SHORT_UUID(lc->uuid));
@@ -837,7 +837,7 @@ out:
 	lc->sync_search = 0;
 	lc->state = LOG_RESUMED;
 	lc->recovery_halted = 0;
-	
+
 	return rq->error;
 }
 
@@ -1032,7 +1032,7 @@ static int clog_flush(struct dm_ulog_request *rq, int server)
 {
 	int r = 0;
 	struct log_c *lc = get_log(rq->uuid, rq->luid);
-	
+
 	if (!lc)
 		return -EINVAL;
 
@@ -1614,7 +1614,7 @@ out:
 
 	rq->data_size = sizeof(*pkg);
 
-	return 0;	
+	return 0;
 }
 
 
diff --git a/daemons/cmirrord/link_mon.c b/daemons/cmirrord/link_mon.c
index 80a98d0c9..74058f99b 100644
--- a/daemons/cmirrord/link_mon.c
+++ b/daemons/cmirrord/link_mon.c
@@ -58,7 +58,7 @@ int links_register(int fd, const char *name, int (*callback)(void *data), void *
 			free(lc);
 			return -ENOMEM;
 		}
-		
+
 		pfds = tmp;
 		free_pfds = used_pfds + 1;
 	}
@@ -125,7 +125,7 @@ int links_monitor(void)
 	for (i = 0; i < used_pfds; i++)
 		if (pfds[i].revents & POLLIN) {
 			LOG_DBG("Data ready on %d", pfds[i].fd);
-				
+
 			/* FIXME: Add this back return 1;*/
 			r++;
 		}
diff --git a/daemons/cmirrord/local.c b/daemons/cmirrord/local.c
index 9e076c42a..26dbff9ce 100644
--- a/daemons/cmirrord/local.c
+++ b/daemons/cmirrord/local.c
@@ -249,7 +249,7 @@ static int do_local_work(void *data __attribute__((unused)))
 		if (r)
 			LOG_ERROR("Failed to respond to kernel [%s]",
 				  RQ_TYPE(u_rq->request_type));
-			
+
 		break;
 	case DM_ULOG_RESUME:
 		/*
diff --git a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
index 679029b5e..e59feb488 100644
--- a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
+++ b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
@@ -124,7 +124,7 @@ static int _get_mirror_event(char *params)
 out:
 	dm_free(args);
 	return r;
-	
+
 out_parse:
 	dm_free(args);
 	syslog(LOG_ERR, "Unable to parse mirror status string.");