Clean Trailing Tab: Signed-off-by: Michal Simek <monstr@monstr.eu>.
diff --git a/testcases/kernel/fs/acls/acl_file_test.c b/testcases/kernel/fs/acls/acl_file_test.c
index 241c20f..75b9f7e 100644
--- a/testcases/kernel/fs/acls/acl_file_test.c
+++ b/testcases/kernel/fs/acls/acl_file_test.c
@@ -28,7 +28,7 @@
 		printf ("Unable to open file %s !", file);
 		return -1;
 	}
-	
+
        if(-1 == (s = flistxattr(fd, list, 1024)) ) {
                perror("flistxattr");
                return 1;
@@ -63,7 +63,7 @@
                 printf("errno = %i\n", errno);
                 rc = 1;
         }
-	
-	close (fd);	
-	return  rc;		
+
+	close (fd);
+	return  rc;	
 }
diff --git a/testcases/kernel/fs/acls/acl_link_test.c b/testcases/kernel/fs/acls/acl_link_test.c
index 25f3874..f5b55e1 100644
--- a/testcases/kernel/fs/acls/acl_link_test.c
+++ b/testcases/kernel/fs/acls/acl_link_test.c
@@ -17,7 +17,7 @@
 		printf ("Please enter a file name as argument.\n");
 		return -1;
 	}
-	
+
        if(-1 == (s = listxattr(argv[1], list, 1024)) ) {
                perror("listxattr");
                return 1;
@@ -47,6 +47,6 @@
                 printf("errno = %i\n", errno);
                 rc = 1;
         }
-	
-	return  rc;		
+
+	return  rc;	
 }
diff --git a/testcases/kernel/fs/dmapi/attr.c b/testcases/kernel/fs/dmapi/attr.c
index 9a00c06..7d88d2e 100644
--- a/testcases/kernel/fs/dmapi/attr.c
+++ b/testcases/kernel/fs/dmapi/attr.c
@@ -63,7 +63,7 @@
 #define NUM_FILES 15
 #define ATTR_LISTLEN 1000
 #define ATTR_BIGLISTLEN 10000
-	
+
 char command[4096];
 char fullAttrName[32];
 dm_sessid_t sid;
@@ -72,7 +72,7 @@
 
 void LogDmStat(dm_stat_t *statdm)
 {
-	
+
 	DMLOG_PRINT(DMLVL_DEBUG, "    dt_dev %d\n", statdm->dt_dev);
 	DMLOG_PRINT(DMLVL_DEBUG, "    dt_ino %d\n", statdm->dt_ino);
 	DMLOG_PRINT(DMLVL_DEBUG, "    dt_mode 0x%x\n", statdm->dt_mode);
@@ -87,11 +87,11 @@
 	DMLOG_PRINT(DMLVL_DEBUG, "    dt_mtime %d\n", statdm->dt_mtime);
 	DMLOG_PRINT(DMLVL_DEBUG, "    dt_ctime %d\n", statdm->dt_ctime);
 
-}	
+}
 
 void LogDmAttrs(dm_attrlist_t *attrlist)
 {
-	
+
 	int i = 0;
 	dm_attrlist_t *attr = attrlist;
 
@@ -123,10 +123,10 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "    dt_change: %d\n", stat->dt_change);
 		if (mask & DM_AT_STAT)
 	       		LogDmStat(stat);
-			
+		
 		stat = DM_STEP_TO_NEXT(stat, dm_stat_t *);
 	}
-}	
+}
 
 dm_stat_t *GetDirEntry(void *attrlist, char *compname)
 {
@@ -139,8 +139,8 @@
 		stat = DM_STEP_TO_NEXT(stat, dm_stat_t *);
 	}
 	return NULL;
-		
-}	
+	
+}
 
 dm_stat_t *GetLastDirEntry(void *attrlist)
 {
@@ -153,8 +153,8 @@
 		stat = DM_STEP_TO_NEXT(stat, dm_stat_t *);
 	}
 	return laststat;
-		
-}	
+	
+}
 
 int GetNumDirEntry(void *attrlist)
 {
@@ -167,8 +167,8 @@
 		stat = DM_STEP_TO_NEXT(stat, dm_stat_t *);
 	}
 	return i;
-		
-}	
+	
+}
 
 int main(int argc, char **argv)
 {
@@ -200,7 +200,7 @@
 				if (write(fd, DUMMY_STRING, DUMMY_STRLEN) != DUMMY_STRLEN) {
 					rc = -1;
 					break;
-				}					
+				}				
 			}
 		} else {
 			rc = -1;
@@ -228,7 +228,7 @@
 			dm_destroy_session(sid);
 			DM_EXIT();
 		}
-		
+	
 		rc = dm_get_config(fshanp, fshlen, DM_CONFIG_PERS_INHERIT_ATTRIBS, &persInheritAttr);
 		if (rc == -1) {
 			DMLOG_PRINT(DMLVL_ERR, "dm_get_config failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -236,7 +236,7 @@
 			dm_destroy_session(sid);
 			DM_EXIT();
 		}
-		
+	
 		dm_handle_free(fshanp, fshlen);
 
 		sprintf(fullAttrName, "%s%s", DMAPI_ATTR_PREFIX, ATTR_NAME);
@@ -252,9 +252,9 @@
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI attribute tests\n") ;
-	
+
 	szFuncName = "dm_set_dmattr";
-	
+
 	/*
 	 * TEST    : dm_set_dmattr - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1255,7 +1255,7 @@
 		memset(attrname.an_chars, 0, DM_ATTR_NAME_SIZE);
 		memcpy(attrname.an_chars, ATTR_NAME, DM_ATTR_NAME_SIZE);
 		memcpy(buf, ATTR_VALUE, ATTR_VALUELEN);
-	
+
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_set_dmattr(sid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, &attrname, 0, sizeof(buf), buf);
@@ -1308,7 +1308,7 @@
 	}
 
 	szFuncName = "dm_get_dmattr";
-	
+
 	/*
 	 * TEST    : dm_get_dmattr - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1734,7 +1734,7 @@
 				DMLOG_PRINT(DMLVL_DEBUG, "rlen = %d\n", rlen);
 			}
 			DMVAR_ENDPASSEXP(szFuncName, 0, rc);
-	
+
 			/* Variation clean up */
 			rc = close(fd);
 			rc |= remove(DUMMY_FILE);
@@ -1799,7 +1799,7 @@
 	  			DMLOG_PRINT(DMLVL_ERR, "%s failed with unexpected rc = %d\n", szFuncName, -1);
 				DMVAR_FAIL();
 			}
-	
+
 			/* Variation clean up */
 			rc = close(fd);
 			rc |= remove(DUMMY_FILE);
@@ -2251,7 +2251,7 @@
 	}
 
 	szFuncName = "dm_remove_dmattr";
-	
+
 	/*
 	 * TEST    : dm_remove_dmattr - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -2906,7 +2906,7 @@
 	}
 
 	szFuncName = "dm_getall_dmattr";
-	
+
 	/*
 	 * TEST    : dm_getall_dmattr - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -3299,7 +3299,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_getall_dmattr - one file attribute
 	 * EXPECTED: rc = 0
@@ -3719,7 +3719,7 @@
 		memset(attrname.an_chars, 0, DM_ATTR_NAME_SIZE);
 		memcpy(attrname.an_chars, ATTR_NAME, DM_ATTR_NAME_SIZE);
 		memcpy(buf, ATTR_VALUE, ATTR_VALUELEN);
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_getall_dmattr(sid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, sizeof(buf), buf, &rlen);
@@ -5076,7 +5076,7 @@
 
 		/* Variation set up */
 		fileattr.fa_uid = DUMMY_UID;
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_set_fileattr(sid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, DM_AT_UID, &fileattr);
@@ -6329,7 +6329,7 @@
 		dm_stat_t stat;
 
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_get_fileattr(sid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, DM_AT_EMASK, &stat);
@@ -6630,7 +6630,7 @@
 			rc = dm_init_attrloc(sid, hanp, hlen, DM_NO_TOKEN, &loc);
 			if (rc == 0) {
 				DMLOG_PRINT(DMLVL_DEBUG, "loc = %lld\n", loc);
-			}				
+			}			
 			DMVAR_ENDPASSEXP(szFuncName, 0, rc);
 
 			/* Variation clean up */
@@ -6671,7 +6671,7 @@
 			rc = dm_init_attrloc(sid, hanp, hlen, DM_NO_TOKEN, &loc);
 			if (rc == 0) {
 				DMLOG_PRINT(DMLVL_DEBUG, "loc = %lld\n", loc);
-			}				
+			}			
 			DMVAR_ENDPASSEXP(szFuncName, 0, rc);
 
 			/* Variation clean up */
@@ -6730,7 +6730,7 @@
 		dm_attrloc_t loc;
 
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_init_attrloc(sid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, &loc);
@@ -9705,7 +9705,7 @@
 		/* Variation set up */
 		memset(attrname.an_chars, 0, DM_ATTR_NAME_SIZE);
 		memcpy(attrname.an_chars, ATTR_NAME, DM_ATTR_NAME_SIZE);
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_set_inherit(sid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, &attrname, 0);
@@ -10048,7 +10048,7 @@
 		/* Variation set up */
 		memset(attrname.an_chars, 0, DM_ATTR_NAME_SIZE);
 		memcpy(attrname.an_chars, ATTR_NAME, DM_ATTR_NAME_SIZE);
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_clear_inherit(sid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, &attrname);
@@ -10383,7 +10383,7 @@
 		u_int nelem;
 
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_getall_inherit(sid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, 1, &inheritbuf, &nelem);
@@ -10474,6 +10474,6 @@
 	remove(DUMMY_TMP);
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
diff --git a/testcases/kernel/fs/dmapi/config.c b/testcases/kernel/fs/dmapi/config.c
index 58d485f..4af16a9 100644
--- a/testcases/kernel/fs/dmapi/config.c
+++ b/testcases/kernel/fs/dmapi/config.c
@@ -38,10 +38,10 @@
 	char *varstr;
 	int   rc;
 	int   i;
-	
+
 	DMOPT_PARSE(argc, argv);
 	DMLOG_START();
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION AND NO PREEXISTING FILES!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -49,7 +49,7 @@
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI configuration tests\n") ;
-	
+
 	szFuncName = "dm_get_config";
 
 	/*
@@ -404,7 +404,7 @@
 	}
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/disp.c b/testcases/kernel/fs/dmapi/disp.c
index 2ad99f5..ca36c38 100644
--- a/testcases/kernel/fs/dmapi/disp.c
+++ b/testcases/kernel/fs/dmapi/disp.c
@@ -70,7 +70,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -108,7 +108,7 @@
 				if (write(fd, DUMMY_STRING, DUMMY_STRLEN) != DUMMY_STRLEN) {
 					rc = -1;
 					break;
-				}					
+				}				
 			}
 		} else {
 			rc = -1;
@@ -124,14 +124,14 @@
 			dm_destroy_session(sid);
 			DM_EXIT();
 		}
-		
+	
 		rc = mkdir(DummySubdir, DUMMY_DIR_RW_MODE);
 		if (rc == -1) {
 			DMLOG_PRINT(DMLVL_ERR, "creating dummy dir failed! (rc = %d, errno = %d)\n", rc, errno);
 			dm_destroy_session(sid);
 			DM_EXIT();
 		}
-		
+	
 		DMEV_ZERO(maxEvents);
 		DMEV_SET(DM_EVENT_PREUNMOUNT, maxEvents);
 		DMEV_SET(DM_EVENT_UNMOUNT, maxEvents);
@@ -149,14 +149,14 @@
 		DMEV_SET(DM_EVENT_ATTRIBUTE, maxEvents);
 		DMEV_SET(DM_EVENT_DESTROY, maxEvents);
 		DMEV_SET(DM_EVENT_NOSPACE, maxEvents);
-	
+
 		DMEV_ZERO(minEvents);
 		DMEV_SET(DM_EVENT_PREUNMOUNT, minEvents);
 		DMEV_SET(DM_EVENT_UNMOUNT, minEvents);
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI disposition/eventlist tests\n") ;
-	
+
 	szFuncName = "dm_get_config_events";
 
 	/*
@@ -184,7 +184,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_config_events - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -210,7 +210,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_config_events - invalid nelem
 	 * EXPECTED: rc = -1, errno = E2BIG
@@ -254,7 +254,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_config_events - invalid eventsetp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -279,7 +279,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_config_events - invalid nelemp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -304,7 +304,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_config_events - fs handle
 	 * EXPECTED: rc = 0
@@ -349,7 +349,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_config_events - file handle
 	 * EXPECTED: rc = 0
@@ -392,7 +392,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_config_events - dir handle
 	 * EXPECTED: rc = 0
@@ -435,7 +435,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_config_events - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -445,7 +445,7 @@
 		u_int nelem;
 
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_get_config_events(DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_EVENT_MAX, &eventset, &nelem);
@@ -453,7 +453,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_get_config_events - invalidated handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -486,7 +486,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	szFuncName = "dm_set_disp";
 
 	/*
@@ -522,7 +522,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_disp - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -556,7 +556,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_disp - invalid hanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -590,7 +590,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_disp - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -624,7 +624,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_disp - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -658,7 +658,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_disp - invalid eventsetp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -691,7 +691,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_disp - invalid maxevent
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -725,7 +725,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_disp - file handle
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -759,7 +759,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_disp - directory handle
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -793,7 +793,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_disp - invalid global handle event
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -822,7 +822,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_disp - invalid fs handle event
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -858,7 +858,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_disp - valid global handle event
 	 * EXPECTED: rc = 0
@@ -887,7 +887,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_disp - valid fs handle event
 	 * EXPECTED: rc = 0
@@ -923,7 +923,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	szFuncName = "dm_getall_disp";
 
 	/*
@@ -961,7 +961,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_getall_disp - invalidated sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -992,7 +992,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalidated sid)\n", szFuncName);
 			rc = dm_getall_disp(newsid, sizeof(buf), buf, &rlen);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 			/* Variation clean up */
 			dm_handle_free(hanp, hlen);
 		}
@@ -1179,7 +1179,7 @@
 				DMLOG_PRINT(DMLVL_DEBUG, "rlen = %d\n", rlen);
 			}
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, E2BIG);
-	
+
 			/* Variation clean up */
 			rc = dm_destroy_session(newsid);
 			if (rc == -1) {
@@ -1240,7 +1240,7 @@
 				DMLOG_PRINT(DMLVL_ERR, "%s failed with unexpected rc = %d (errno = %d)\n", szFuncName, rc, errno);
 				DMVAR_FAIL();
 			}
-	
+
 			/* Variation clean up */
 			rc = dm_destroy_session(newsid);
 			if (rc == -1) {
@@ -1285,7 +1285,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_eventlist - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1319,7 +1319,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_eventlist - invalid hanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -1353,7 +1353,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_eventlist - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -1387,7 +1387,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_eventlist - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1421,7 +1421,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_eventlist - invalid eventsetp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -1454,7 +1454,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_eventlist - invalid maxevent
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1488,7 +1488,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_eventlist - maxevent < high set event
 	 * EXPECTED: rc = 0
@@ -1540,7 +1540,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_eventlist - maxevent > high set event
 	 * EXPECTED: rc = 0
@@ -1592,7 +1592,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * Global handle dm_set_eventlist variations
 	 *
@@ -1833,7 +1833,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - invalid hanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -1876,7 +1876,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -1919,7 +1919,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1962,7 +1962,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - directory handle
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -2008,7 +2008,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - invalid nelem, fs handle
 	 * EXPECTED: rc = -1, errno = E2BIG
@@ -2059,7 +2059,7 @@
 	  			DMLOG_PRINT(DMLVL_ERR, "%s failed with unexpected rc = %d\n", szFuncName, rc);
 				DMVAR_FAIL();
 			}
-	
+
 			/* Variation clean up */
 			DMEV_ZERO(ineventset);
 			rc = dm_set_eventlist(newsid, hanp, hlen, DM_NO_TOKEN, &ineventset, DM_EVENT_MAX);
@@ -2070,7 +2070,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - invalid nelem, file handle
 	 * EXPECTED: rc = -1, errno = E2BIG
@@ -2118,7 +2118,7 @@
 	  			DMLOG_PRINT(DMLVL_ERR, "%s failed with unexpected rc = %d\n", szFuncName, rc);
 				DMVAR_FAIL();
 			}
-	
+
 			/* Variation clean up */
 			DMEV_ZERO(ineventset);
 			rc = dm_set_eventlist(newsid, hanp, hlen, DM_NO_TOKEN, &ineventset, DM_EVENT_MAX);
@@ -2129,7 +2129,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - invalid eventsetp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -2172,7 +2172,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - invalid nelemp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -2214,7 +2214,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - zero event, fs handle
 	 * EXPECTED: rc = 0
@@ -2268,7 +2268,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - zero event, file handle
 	 * EXPECTED: rc = 0
@@ -2322,7 +2322,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - one event, fs handle
 	 * EXPECTED: rc = 0
@@ -2382,7 +2382,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - one event, file handle
 	 * EXPECTED: rc = 0
@@ -2442,7 +2442,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - multi event, fs handle
 	 * EXPECTED: rc = 0
@@ -2504,7 +2504,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - multi event, file handle
 	 * EXPECTED: rc = 0
@@ -2566,7 +2566,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - read event
 	 * EXPECTED: rc = 0
@@ -2628,7 +2628,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - write event
 	 * EXPECTED: rc = 0
@@ -2690,7 +2690,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - truncate event
 	 * EXPECTED: rc = 0
@@ -2752,7 +2752,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - event union, file handle
 	 * EXPECTED: rc = 0
@@ -2818,7 +2818,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -2839,7 +2839,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 			rc = dm_get_eventlist(newsid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, DM_EVENT_MAX, &outeventset, &nelem);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EBADF);
-		
+	
 			/* Variation clean up */
 			rc = dm_destroy_session(newsid);
 			if (rc == -1) {
@@ -2847,7 +2847,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_eventlist - invalidated file handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -2892,7 +2892,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/* We now need to repoint preunmount/unmount back to original session */
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_PREUNMOUNT, events);
@@ -2935,7 +2935,7 @@
 	}
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -3046,7 +3046,7 @@
 			case DM_EVENT_CLOSE:
 				response = DM_RESP_INVALID;
 				break;
-				
+			
 			default:
 			{
 				DMLOG_PRINT(DMLVL_ERR, "Message is unexpected!\n");
@@ -3063,4 +3063,4 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/dm_test.c b/testcases/kernel/fs/dmapi/dm_test.c
index 8d00a2e..9623365 100644
--- a/testcases/kernel/fs/dmapi/dm_test.c
+++ b/testcases/kernel/fs/dmapi/dm_test.c
@@ -119,7 +119,7 @@
 }
 
 char *dm_GetCommandLineOption(char *option) {
-	
+
    	int i;
 
 	if (!dm_argc)
@@ -174,9 +174,9 @@
 			fprintf(dm_fpLogFile, "\n%s starting at %02u:%02u:%02u on %02u/%02u/%04u\n", dm_TestCaseName, pDT->tm_hour, pDT->tm_min, pDT->tm_sec, pDT->tm_mon+1, pDT->tm_mday, pDT->tm_year+1900);
 		else
 			fprintf(dm_fpLogFile, "\n%s starting\n", dm_TestCaseName);
-				
+			
 	}
-	
+
 	if (dm_TerminalLoggingLevel) {
 		printf("%s running on %s\n", TEST_NAME, version);
 		printf("%s invoked with ", dm_TestCaseName);
@@ -191,7 +191,7 @@
 }
 
 void dm_StopLogging(void) {
-	
+
    	struct timeval tv;
 	struct tm *pDT = NULL;
 	struct tm sDT;
@@ -205,7 +205,7 @@
 
 	if (dm_PassedVariations)
 		percentSuccess = (dm_PassedVariations * 100)/ranVariations;
-		
+	
 	if (gettimeofday(&tv, NULL) != -1)
 		pDT = (struct tm *)localtime_r(&tv.tv_sec, &sDT);
 
@@ -214,7 +214,7 @@
 			fprintf(dm_fpLogFile, "%s stopping at %02u:%02u:%02u on %02u/%02u/%04u\n", dm_TestCaseName, pDT->tm_hour, pDT->tm_min, pDT->tm_sec, pDT->tm_mon+1, pDT->tm_mday, pDT->tm_year+1900);
 		else
 			fprintf(dm_fpLogFile, "%s stopping\n", dm_TestCaseName);
-				
+			
 		fprintf(dm_fpLogFile, "%s status: %u executed, %u passed, %u failed, %u skipped (%u%%)\n", dm_TestCaseName, ranVariations, dm_PassedVariations, dm_FailedVariations, dm_SkippedVariations, percentSuccess);
 	}
 
@@ -223,7 +223,7 @@
 			printf("%s stopping at %02u:%02u:%02u on %02u/%02u/%04u\n", dm_TestCaseName, pDT->tm_hour, pDT->tm_min, pDT->tm_sec, pDT->tm_mon+1, pDT->tm_mday, pDT->tm_year+1900);
 		else
 			printf("%s stopping\n", dm_TestCaseName);
-				
+			
 		printf("%s status: %u executed, %u passed, %u failed, %u skipped (%u%%)\n", dm_TestCaseName, ranVariations, dm_PassedVariations, dm_FailedVariations, dm_SkippedVariations, percentSuccess);
 	}
 
@@ -272,7 +272,7 @@
 }
 
 int dm_ExecuteVariation(int var) {
-	
+
 	if (dm_CurrentVariation)
 		dm_Error("Cannot execute variation while variation active\n");
 	if (var < dm_StartingVariation || var > dm_StoppingVariation)
@@ -303,7 +303,7 @@
 
 	dm_CurrentVariation = 0;
 
-}	
+}
 
 void dm_FailVariation(void) {
 
@@ -317,7 +317,7 @@
 
 	dm_CurrentVariation = 0;
 
-}	
+}
 
 void dm_SkipVariation(void) {
 
@@ -331,7 +331,7 @@
 
 	dm_CurrentVariation = 0;
 
-}	
+}
 
 void dm_EndVariation_SuccessExpected(char *funcname, int expectedRC, int actualRC)
 {
@@ -344,7 +344,7 @@
 		DMVAR_FAIL();
 	}
 
-}	
+}
 
 void dm_EndVariation_FailureExpected(char *funcname, int expectedRC, int actualRC, int expectedErrno)
 {
@@ -361,8 +361,8 @@
 	  	DMLOG_PRINT(DMLVL_ERR, "%s failed with unexpected rc = %d\n", funcname, actualRC);
 		DMVAR_FAIL();
 	}
-	
-}	
+
+}
 
 int dm_CheckVariation_SuccessExpected(int expectedRC, int actualRC, dm_eventtype_t expectedEvent, dm_eventtype_t actualEvent)
 {
@@ -380,7 +380,7 @@
 		return DMSTAT_FAIL;
 	}
 
-}	
+}
 
 int dm_CheckVariation_FailureExpected(int expectedRC, int actualRC, int expectedErrno, dm_eventtype_t expectedEvent, dm_eventtype_t actualEvent)
 {
@@ -403,7 +403,7 @@
 		return DMSTAT_FAIL;
 	}
 
-}	
+}
 
 void dm_LogHandle(char *hdl, int len) {
 
@@ -417,7 +417,7 @@
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Handle: %s\n", outbuf);
 
-}	
+}
 
 /* This static array is for the persistent managed region test */
 dm_region_t dm_PMR_regbuf[PMR_NUM_REGIONS] = {
diff --git a/testcases/kernel/fs/dmapi/event.c b/testcases/kernel/fs/dmapi/event.c
index f00cb5c..af1aa0d 100644
--- a/testcases/kernel/fs/dmapi/event.c
+++ b/testcases/kernel/fs/dmapi/event.c
@@ -69,7 +69,7 @@
 
 		em = DM_STEP_TO_NEXT(em, dm_eventmsg_t *);
 	}
-}	
+}
 
 dm_eventmsg_t *GetSyncEventMsg(void *bufp)
 {
@@ -83,7 +83,7 @@
 	}
 
 	return NULL;
-}	
+}
 
 int GetNumEventMsg(void *bufp)
 {
@@ -95,7 +95,7 @@
 		em = DM_STEP_TO_NEXT(em, dm_eventmsg_t *);
 	}
 	return i;
-}	
+}
 
 int main(int argc, char **argv)
 {
@@ -110,7 +110,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -121,9 +121,9 @@
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI move event tests\n") ;
-	
+
 	szFuncName = "dm_get_events";
-	
+
 	/*
 	 * TEST    : dm_get_events - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -133,15 +133,15 @@
 		size_t rlen;
 
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid sid)\n", szFuncName);
 		rc = dm_get_events(INVALID_ADDR, 0, 0, sizeof(buf), buf, &rlen);
 		DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_get_events - invalid buflen
 	 * EXPECTED: rc = -1, errno = E2BIG
@@ -161,7 +161,7 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_events - invalid bufp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -181,7 +181,7 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_events - invalid rlenp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -201,7 +201,7 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_events - !DM_EV_WAIT with no messages
 	 * EXPECTED: rc = -1, errno = EAGAIN
@@ -217,7 +217,7 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_events - !DM_EV_WAIT with one message
 	 * EXPECTED: rc = 0
@@ -239,7 +239,7 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_events - DM_EV_WAIT with one message
 	 * EXPECTED: rc = 0
@@ -261,7 +261,7 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_events - !DM_EV_WAIT with two messages
 	 * EXPECTED: rc = 0
@@ -286,7 +286,7 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_events - DM_EV_WAIT with two messages
 	 * EXPECTED: rc = 0
@@ -311,7 +311,7 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_events - !DM_EV_WAIT with more than MAX_EVENT messages
 	 * EXPECTED: rc = 0
@@ -340,9 +340,9 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	szFuncName = "dm_respond_event";
-	
+
 	/*
 	 * TEST    : dm_respond_event - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -362,7 +362,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid sid)\n", szFuncName);
 			rc = dm_respond_event(INVALID_ADDR, token, DM_RESP_CONTINUE, 0, sizeof(buf), buf);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			if (rc == -1) {
@@ -370,7 +370,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - DM_NO_SESSION sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -390,7 +390,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_NO_SESSION sid)\n", szFuncName);
 			rc = dm_respond_event(DM_NO_SESSION, token, DM_RESP_CONTINUE, 0, sizeof(buf), buf);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			if (rc == -1) {
@@ -398,7 +398,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -413,10 +413,10 @@
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid token)\n", szFuncName);
 		rc = dm_respond_event(sid, INVALID_ADDR, DM_RESP_CONTINUE, 0, sizeof(buf), buf);
 		DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - DM_NO_TOKEN token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -431,10 +431,10 @@
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_NO_TOKEN token)\n", szFuncName);
 		rc = dm_respond_event(sid, DM_NO_TOKEN, DM_RESP_CONTINUE, 0, sizeof(buf), buf);
 		DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - DM_INVALID_TOKEN token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -449,10 +449,10 @@
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_INVALID_TOKEN token)\n", szFuncName);
 		rc = dm_respond_event(sid, DM_INVALID_TOKEN, DM_RESP_CONTINUE, 0, sizeof(buf), buf);
 		DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - invalid response
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -472,7 +472,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid response)\n", szFuncName);
 			rc = dm_respond_event(sid, token, INVALID_ADDR, 0, sizeof(buf), buf);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			if (rc == -1) {
@@ -480,7 +480,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - invalid buflen
 	 * EXPECTED: rc = -1, errno = E2BIG
@@ -503,7 +503,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid response)\n", szFuncName);
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, INVALID_ADDR, buf);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, E2BIG);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			if (rc == -1) {
@@ -511,7 +511,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - invalidated token
 	 * EXPECTED: rc = -1, errno = ESRCH
@@ -534,11 +534,11 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalidated token)\n", szFuncName);
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, sizeof(buf), buf);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, ESRCH);
-	
+
 			/* Variation clean up */
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - DM_RESP_INVALID
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -558,7 +558,7 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - DM_RESP_CONTINUE with zero reterror
 	 * EXPECTED: rc = 0
@@ -590,7 +590,7 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - DM_RESP_CONTINUE with non-zero reterror
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -610,7 +610,7 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - DM_RESP_ABORT with zero reterror
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -630,7 +630,7 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - DM_RESP_ABORT with non-zero reterror
 	 * EXPECTED: rc = ABORT_ERRNO
@@ -667,7 +667,7 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - DM_RESP_DONTCARE
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -687,9 +687,9 @@
 			pthread_join(tid, NULL);
 		}
 	}
-	
+
 	szFuncName = "dm_move_event";
-	
+
 	/*
 	 * TEST    : dm_move_event - invalid srcsid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -714,7 +714,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid srcsid)\n", szFuncName);
 			rc = dm_move_event(INVALID_ADDR, token, targsid, &rtoken);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			rc |= dm_destroy_session(targsid);
@@ -723,7 +723,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_move_event - DM_NO_SESSION srcsid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -748,7 +748,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_NO_SESSION srcsid)\n", szFuncName);
 			rc = dm_move_event(DM_NO_SESSION, token, targsid, &rtoken);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			rc |= dm_destroy_session(targsid);
@@ -757,7 +757,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_move_event - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -782,7 +782,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid token)\n", szFuncName);
 			rc = dm_move_event(sid, INVALID_ADDR, targsid, &rtoken);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			rc |= dm_destroy_session(targsid);
@@ -791,7 +791,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_move_event - invalid targetsid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -816,7 +816,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid targetsid)\n", szFuncName);
 			rc = dm_move_event(sid, token, INVALID_ADDR, &rtoken);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			rc |= dm_destroy_session(targsid);
@@ -825,7 +825,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_move_event - DM_NO_SESSION targetsid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -850,7 +850,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_NO_SESSION targetsid)\n", szFuncName);
 			rc = dm_move_event(sid, token, DM_NO_SESSION, &rtoken);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			rc |= dm_destroy_session(targsid);
@@ -859,7 +859,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_move_event - invalid rtokenp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -887,7 +887,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid rtokenp)\n", szFuncName);
 			rc = dm_move_event(sid, token, targsid, (dm_token_t *)INVALID_ADDR);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EFAULT);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			rc |= dm_destroy_session(targsid);
@@ -1040,7 +1040,7 @@
 	}
 
 	szFuncName = "dm_pending";
-	
+
 	/*
 	 * TEST    : dm_pending - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1061,7 +1061,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid sid)\n", szFuncName);
 			rc = dm_pending(INVALID_ADDR, token, &delay);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			if (rc == -1) {
@@ -1069,7 +1069,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_pending - DM_NO_SESSION sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1090,7 +1090,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_NO_SESSION sid)\n", szFuncName);
 			rc = dm_pending(DM_NO_SESSION, token, &delay);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			if (rc == -1) {
@@ -1098,7 +1098,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_pending - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1112,10 +1112,10 @@
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid token)\n", szFuncName);
 		rc = dm_pending(sid, INVALID_ADDR, &delay);
 		DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_pending - DM_NO_TOKEN token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1129,7 +1129,7 @@
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_NO_TOKEN token)\n", szFuncName);
 		rc = dm_pending(sid, DM_NO_TOKEN, &delay);
 		DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 		/* Variation clean up */
 	}
 
@@ -1146,7 +1146,7 @@
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_INVALID_TOKEN token)\n", szFuncName);
 		rc = dm_pending(sid, DM_INVALID_TOKEN, &delay);
 		DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 		/* Variation clean up */
 	}
 
@@ -1169,7 +1169,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_NO_SESSION sid)\n", szFuncName);
 			rc = dm_pending(sid, token, (dm_timestruct_t *)INVALID_ADDR);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EFAULT);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			if (rc == -1) {
@@ -1177,7 +1177,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_respond_event - invalidated token
 	 * EXPECTED: rc = -1, errno = ESRCH
@@ -1201,11 +1201,11 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalidated token)\n", szFuncName);
 			rc = dm_pending(sid, token, &delay);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, ESRCH);
-	
+
 			/* Variation clean up */
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_pending - valid
 	 * EXPECTED: rc = 0
@@ -1226,7 +1226,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(valid)\n", szFuncName);
 			rc = dm_pending(sid, token, &delay);
 			DMVAR_ENDPASSEXP(szFuncName, 0, rc);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			if (rc == -1) {
@@ -1234,14 +1234,14 @@
 			}
 		}
 	}
-	
+
 	rc = dm_destroy_session(sid);
 	if (rc == -1) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_destroy_session failed! (rc = %d, errno = %d)\n", rc, errno);
 	}
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -1261,7 +1261,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid buflen)\n", szFuncName);
 			rc = dm_get_events(sid, MAX_EVENT, 0, 0, dmMsgBuf, &rlen);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, E2BIG);
-		
+	
 			/* Variation clean up */
 			rc = dm_get_events(sid, MAX_EVENT, 0, sizeof(dmMsgBuf), dmMsgBuf, &rlen);
 			if (rc == 0) {
@@ -1278,7 +1278,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid bufp)\n", szFuncName);
 			rc = dm_get_events(sid, MAX_EVENT, 0, sizeof(dmMsgBuf), (void *)INVALID_ADDR, &rlen);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EFAULT);
-		
+	
 			/* Variation clean up */
 			rc = dm_get_events(sid, MAX_EVENT, 0, sizeof(dmMsgBuf), dmMsgBuf, &rlen);
 			if (rc == 0) {
@@ -1295,7 +1295,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid rlenp)\n", szFuncName);
 			rc = dm_get_events(sid, MAX_EVENT, 0, sizeof(dmMsgBuf), dmMsgBuf, (size_t *)INVALID_ADDR);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EFAULT);
-		
+	
 			/* Variation clean up */
 			rc = dm_get_events(sid, MAX_EVENT, 0, sizeof(dmMsgBuf), dmMsgBuf, &rlen);
 			if (rc == 0) {
@@ -1312,7 +1312,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(!DM_EV_WAIT with no messages)\n", szFuncName);
 			rc = dm_get_events(sid, MAX_EVENT, 0, sizeof(dmMsgBuf), dmMsgBuf, &rlen);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EAGAIN);
-		
+	
 			/* Variation clean up */
 
 			break;
@@ -1379,7 +1379,7 @@
 					DMLOG_PRINT(DMLVL_DEBUG, "rlen = %d\n", rlen);
 					LogEventMsgs(dmMsgBuf);
 					dmMsg = GetSyncEventMsg(dmMsgBuf);
-	
+
 					if (numMsg == expectedNumMsg) {
 						if (dmMsg != NULL) {
 							if (dmMsg->ev_type == DM_EVENT_USER) {
@@ -1415,7 +1415,7 @@
 			}
 
 			break;
-			
+		
 		case RESPOND_EVENT_BASE + 9:
 			/* Variation */
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_RESP_INVALID)\n", szFuncName);
@@ -1515,4 +1515,4 @@
 	}
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/event_am.c b/testcases/kernel/fs/dmapi/event_am.c
index 79f2775..4d85db9 100644
--- a/testcases/kernel/fs/dmapi/event_am.c
+++ b/testcases/kernel/fs/dmapi/event_am.c
@@ -75,7 +75,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -104,7 +104,7 @@
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI asynchronous metadata event tests\n") ;
-	
+
 	/*
 	 *  First batch of tests will be with events enabled on file system,
 	 *  so set up events on fs accordingly
@@ -115,7 +115,7 @@
 		dm_destroy_session(sid);
 		DM_EXIT();
 	}
-	
+
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_PREUNMOUNT, events);
 	DMEV_SET(DM_EVENT_UNMOUNT, events);
@@ -153,7 +153,7 @@
 			EVENT_DELIVERY_DELAY;
 			if ((varStatus = DMVAR_CHKPASSEXP(0, rc, eventExpected, eventReceived)) == DMSTAT_PASS) {
 				struct stat statfs;
-			
+		
 				rc = dm_handle_to_ino(ahanp1, ahlen1, &ino);
 				rc |= stat(DummySubdir, &statfs);
 		        	if (rc == -1) {
@@ -183,7 +183,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : chown - enabled on fs
 	 * EXPECTED: DM_EVENT_ATTRIBUTE
@@ -208,7 +208,7 @@
 			EVENT_DELIVERY_DELAY;
 			if ((varStatus = DMVAR_CHKPASSEXP(0, rc, eventExpected, eventReceived)) == DMSTAT_PASS) {
 				struct stat statfs;
-			
+		
 				rc = dm_handle_to_ino(ahanp1, ahlen1, &ino);
 				rc |= stat(DummySubdir, &statfs);
 		        	if (rc == -1) {
@@ -241,7 +241,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : close - enabled on fs
 	 * EXPECTED: DM_EVENT_CLOSE
@@ -322,7 +322,7 @@
 			EVENT_DELIVERY_DELAY;
 			if ((varStatus = DMVAR_CHKPASSEXP(0, rc, eventExpected, eventReceived)) == DMSTAT_PASS) {
 				struct stat statfs;
-			
+		
 				rc = dm_handle_to_ino(ahanp1, ahlen1, &ino);
 				rc |= stat(DummyFile, &statfs);
 		        	if (rc == -1) {
@@ -382,7 +382,7 @@
 			EVENT_DELIVERY_DELAY;
 			if ((varStatus = DMVAR_CHKPASSEXP(0, rc, eventExpected, eventReceived)) == DMSTAT_PASS) {
 				struct stat statfs;
-			
+		
 				rc = dm_handle_to_ino(ahanp1, ahlen1, &ino);
 				rc |= stat(DummyFile, &statfs);
 		        	if (rc == -1) {
@@ -415,7 +415,7 @@
 			}
 		}
 	}
-		
+	
 	/*
 	 * TEST    : close - enabled on fs
 	 * EXPECTED: DM_EVENT_CLOSE
@@ -478,7 +478,7 @@
 		dm_destroy_session(sid);
 		DM_EXIT();
 	}
-	
+
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_PREUNMOUNT, events);
 	DMEV_SET(DM_EVENT_UNMOUNT, events);
@@ -527,7 +527,7 @@
 			EVENT_DELIVERY_DELAY;
 			if ((varStatus = DMVAR_CHKPASSEXP(0, rc, eventExpected, eventReceived)) == DMSTAT_PASS) {
 				struct stat statfs;
-			
+		
 				rc = dm_handle_to_ino(ahanp1, ahlen1, &ino);
 				rc |= stat(DummySubdir, &statfs);
 		        	if (rc == -1) {
@@ -558,7 +558,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : chown - enabled on directory
 	 * EXPECTED: DM_EVENT_ATTRIBUTE
@@ -592,7 +592,7 @@
 			EVENT_DELIVERY_DELAY;
 			if ((varStatus = DMVAR_CHKPASSEXP(0, rc, eventExpected, eventReceived)) == DMSTAT_PASS) {
 				struct stat statfs;
-			
+		
 				rc = dm_handle_to_ino(ahanp1, ahlen1, &ino);
 				rc |= stat(DummySubdir, &statfs);
 		        	if (rc == -1) {
@@ -626,7 +626,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : close - enabled on directory
 	 * EXPECTED: DM_EVENT_CLOSE
@@ -726,7 +726,7 @@
 			EVENT_DELIVERY_DELAY;
 			if ((varStatus = DMVAR_CHKPASSEXP(0, rc, eventExpected, eventReceived)) == DMSTAT_PASS) {
 				struct stat statfs;
-			
+		
 				rc = dm_handle_to_ino(ahanp1, ahlen1, &ino);
 				rc |= stat(DummyFile, &statfs);
 		        	if (rc == -1) {
@@ -793,7 +793,7 @@
 			EVENT_DELIVERY_DELAY;
 			if ((varStatus = DMVAR_CHKPASSEXP(0, rc, eventExpected, eventReceived)) == DMSTAT_PASS) {
 				struct stat statfs;
-			
+		
 				rc = dm_handle_to_ino(ahanp1, ahlen1, &ino);
 				rc |= stat(DummyFile, &statfs);
 		        	if (rc == -1) {
@@ -826,7 +826,7 @@
 			}
 		}
 	}
-		
+	
 	/*
 	 * TEST    : close - enabled on file
 	 * EXPECTED: DM_EVENT_CLOSE
@@ -928,7 +928,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : chown - disabled
 	 * EXPECTED: DM_EVENT_ATTRIBUTE
@@ -962,7 +962,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : close - disabled
 	 * EXPECTED: DM_EVENT_CLOSE
@@ -1092,7 +1092,7 @@
 			}
 		}
 	}
-		
+	
 	/*
 	 * TEST    : close - disabled
 	 * EXPECTED: DM_EVENT_CLOSE
@@ -1154,7 +1154,7 @@
 		dm_destroy_session(sid);
 		DM_EXIT();
 	}
-	
+
 	rc = dm_get_config(fshanp, fshlen, DM_CONFIG_MAX_ATTR_ON_DESTROY, &maxAttrSize);
 	if (rc == -1) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_get_config failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -1163,7 +1163,7 @@
 	} else {
 		DMLOG_PRINT(DMLVL_DEBUG, "DM_CONFIG_MAX_ATTR_ON_DESTROY %d\n", maxAttrSize);
 	}
-	
+
 	szFuncName = "dm_set_return_on_destroy";
 
 	/*
@@ -1212,7 +1212,7 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_return_on_destroy - invalid hanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -1259,7 +1259,7 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_return_on_destroy - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -1306,7 +1306,7 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_return_on_destroy - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1403,7 +1403,7 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_return_on_destroy - DM_NO_SESSION sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1450,7 +1450,7 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_return_on_destroy - different sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1504,7 +1504,7 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_return_on_destroy - file handle
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1549,7 +1549,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_return_on_destroy - directory handle
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1590,7 +1590,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_return_on_destroy - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -1610,7 +1610,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_set_return_on_destroy - valid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1657,7 +1657,7 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_return_on_destroy - zero length attribute
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1702,7 +1702,7 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_set_return_on_destroy - attribute too big
 	 * EXPECTED: rc = 0
@@ -1757,7 +1757,7 @@
 	}
 
 	dm_handle_free(fshanp, fshlen);
-	
+
 	/* Wait for all pending messages to be handled */
 	EVENT_DELIVERY_DELAY_LOOP;
 
@@ -1774,7 +1774,7 @@
 	}
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -1874,7 +1874,7 @@
 		} else if (type == DM_EVENT_UNMOUNT) {
 			/* SPECIAL CASE: need to set response and bMounted */
 			dm_namesp_event_t *nse = DM_GET_VALUE(dmMsg, ev_data, dm_namesp_event_t *);
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "Message is DM_EVENT_UNMOUNT\n");
 			DMLOG_PRINT(DMLVL_DEBUG, "  Unmount mode: %x\n", nse->ne_mode);
 			DMLOG_PRINT(DMLVL_DEBUG, "  File system handle: %p\n", DM_GET_VALUE(nse, ne_handle1, void *));
@@ -1976,4 +1976,4 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/event_an.c b/testcases/kernel/fs/dmapi/event_an.c
index df58125..2d8f04e 100644
--- a/testcases/kernel/fs/dmapi/event_an.c
+++ b/testcases/kernel/fs/dmapi/event_an.c
@@ -80,7 +80,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -119,7 +119,7 @@
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI asynchronous namespace event tests\n") ;
-	
+
 	/*
 	 *  First batch of tests will be with events enabled on file system,
 	 *  so set up events on fs accordingly
@@ -130,7 +130,7 @@
 		dm_destroy_session(sid);
 		DM_EXIT();
 	}
-	
+
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_PREUNMOUNT, events);
 	DMEV_SET(DM_EVENT_UNMOUNT, events);
@@ -171,7 +171,7 @@
 		EVENT_DELIVERY_DELAY;
 		if ((varStatus = DMVAR_CHKPASSEXP(0, rc, eventExpected, eventReceived)) == DMSTAT_PASS) {
 			struct stat statfs;
-			
+		
 			rc = dm_handle_to_ino(ahanp1, ahlen1, &ino1);
 			rc |= dm_handle_to_ino(ahanp2, ahlen2, &ino2);
 			rc |= stat(DummySubdir, &statfs);
@@ -211,7 +211,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "Unable to clean up variation! (errno = %d)\n", errno);
 		}
 	}
-	
+
 	/*
 	 * TEST    : rmdir - enabled on fs
 	 * EXPECTED: DM_EVENT_POSTREMOVE
@@ -421,7 +421,7 @@
 	 * EXPECTED: DM_EVENT_POSTLINK
 	 */
 	if (DMVAR_EXEC(DIR_ASYNC_NAMESP_EVENT_BASE + 5)) {
-#ifdef DIRECTORY_LINKS		
+#ifdef DIRECTORY_LINKS	
 		dm_ino_t ino, ino1, ino2;
 		void *hanp;
 		size_t hlen;
@@ -473,7 +473,7 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with DIRECTORY_LINKS defined\n");
-		DMVAR_SKIP();		
+		DMVAR_SKIP();	
 #endif
 	}
 
@@ -499,7 +499,7 @@
 		EVENT_DELIVERY_DELAY;
 		if ((varStatus = DMVAR_CHKPASSEXP(0, rc, eventExpected, eventReceived)) == DMSTAT_PASS) {
 			struct stat statfs;
-			
+		
 			rc = dm_handle_to_ino(ahanp1, ahlen1, &ino1);
 			rc |= dm_handle_to_ino(ahanp2, ahlen2, &ino2);
 			rc |= stat(DummyFile, &statfs);
@@ -540,7 +540,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "Unable to clean up variation! (errno = %d)\n", errno);
 		}
 	}
-	
+
 	/*
 	 * TEST    : remove - enabled on fs
 	 * EXPECTED: DM_EVENT_POSTREMOVE
@@ -833,7 +833,7 @@
 		dm_destroy_session(sid);
 		DM_EXIT();
 	}
-	
+
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_PREUNMOUNT, events);
 	DMEV_SET(DM_EVENT_UNMOUNT, events);
@@ -889,7 +889,7 @@
 		EVENT_DELIVERY_DELAY;
 		if ((varStatus = DMVAR_CHKPASSEXP(0, rc, eventExpected, eventReceived)) == DMSTAT_PASS) {
 			struct stat statfs;
-			
+		
 			rc = dm_handle_to_ino(ahanp1, ahlen1, &ino1);
 			rc |= dm_handle_to_ino(ahanp2, ahlen2, &ino2);
 			rc |= stat(DummySubdir, &statfs);
@@ -929,7 +929,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "Unable to clean up variation! (errno = %d)\n", errno);
 		}
 	}
-	
+
 	/*
 	 * TEST    : rmdir - enabled on directory
 	 * EXPECTED: DM_EVENT_POSTREMOVE
@@ -1311,7 +1311,7 @@
 	 * EXPECTED: DM_EVENT_POSTLINK
 	 */
 	if (DMVAR_EXEC(DIR_ASYNC_NAMESP_EVENT_BASE + 12)) {
-#ifdef DIRECTORY_LINKS		
+#ifdef DIRECTORY_LINKS	
 		dm_ino_t ino, ino1, ino2;
 		void *hanp;
 		size_t hlen;
@@ -1363,7 +1363,7 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with DIRECTORY_LINKS defined\n");
-		DMVAR_SKIP();		
+		DMVAR_SKIP();	
 #endif
 	}
 
@@ -1389,7 +1389,7 @@
 		EVENT_DELIVERY_DELAY;
 		if ((varStatus = DMVAR_CHKPASSEXP(0, rc, eventExpected, eventReceived)) == DMSTAT_PASS) {
 			struct stat statfs;
-			
+		
 			rc = dm_handle_to_ino(ahanp1, ahlen1, &ino1);
 			rc |= dm_handle_to_ino(ahanp2, ahlen2, &ino2);
 			rc |= stat(DummyFile, &statfs);
@@ -1430,7 +1430,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "Unable to clean up variation! (errno = %d)\n", errno);
 		}
 	}
-	
+
 	/*
 	 * TEST    : remove - enabled on directory
 	 * EXPECTED: DM_EVENT_POSTREMOVE
@@ -1928,7 +1928,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "Unable to clean up variation! (errno = %d)\n", errno);
 		}
 	}
-	
+
 	/*
 	 * TEST    : rmdir - disabled
 	 * EXPECTED: no event
@@ -2032,7 +2032,7 @@
 	 * EXPECTED: no event
 	 */
 	if (DMVAR_EXEC(DIR_ASYNC_NAMESP_EVENT_BASE + 17)) {
-#ifdef DIRECTORY_LINKS		
+#ifdef DIRECTORY_LINKS	
 		void *hanp;
 		size_t hlen;
 
@@ -2065,7 +2065,7 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with DIRECTORY_LINKS defined\n");
-		DMVAR_SKIP();		
+		DMVAR_SKIP();	
 #endif
 	}
 
@@ -2099,7 +2099,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "Unable to clean up variation! (errno = %d)\n", errno);
 		}
 	}
-	
+
 	/*
 	 * TEST    : remove - disabled
 	 * EXPECTED: no event
@@ -2270,7 +2270,7 @@
 	}
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -2376,7 +2376,7 @@
 		} else if (type == DM_EVENT_UNMOUNT) {
 			/* SPECIAL CASE: need to set response and bMounted */
 			dm_namesp_event_t *nse = DM_GET_VALUE(dmMsg, ev_data, dm_namesp_event_t *);
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "Message is DM_EVENT_UNMOUNT\n");
 			DMLOG_PRINT(DMLVL_DEBUG, "  Unmount mode: %x\n", nse->ne_mode);
 			DMLOG_PRINT(DMLVL_DEBUG, "  File system handle: %p\n", DM_GET_VALUE(nse, ne_handle1, void *));
@@ -2613,4 +2613,4 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/event_sd.c b/testcases/kernel/fs/dmapi/event_sd.c
index 8940000..bb607c5 100644
--- a/testcases/kernel/fs/dmapi/event_sd.c
+++ b/testcases/kernel/fs/dmapi/event_sd.c
@@ -82,7 +82,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -104,7 +104,7 @@
 		DM_EXIT();
 	} else {
 		int fd;
-		
+	
 		sprintf(DummyFile, "%s/%s", mountPt, DUMMY_FILE);
 
 		remove(DummyFile);
@@ -116,7 +116,7 @@
 				if (write(fd, DUMMY_STRING, DUMMY_STRLEN) != DUMMY_STRLEN) {
 					rc = -1;
 					break;
-				}					
+				}				
 			}
 		} else {
 			rc = -1;
@@ -132,7 +132,7 @@
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI synchronous data event tests\n") ;
-	
+
 	/*
 	 * TEST    : read - no regions
 	 * EXPECTED: no event
@@ -358,7 +358,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : read - one TRUNCATE region covering entire file
 	 * EXPECTED: no event
@@ -604,7 +604,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : read - two non-READ regions covering part of file, read from other
 	 * EXPECTED: no event
@@ -704,7 +704,7 @@
 			eventExpected = DM_EVENT_READ;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			rc = read(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, DUMMY_STRLEN, buf);
@@ -849,7 +849,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			rc = read(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, DUMMY_STRLEN, buf);
@@ -1071,7 +1071,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : read - one-byte READ region at start of read, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_READ
@@ -1172,7 +1172,7 @@
 			eventExpected = DM_EVENT_READ;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			rc = read(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, DUMMY_STRLEN, buf);
@@ -1238,7 +1238,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			rc = read(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, DUMMY_STRLEN, buf);
@@ -1259,7 +1259,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : read - one-byte read one byte before start of multibyte READ region
 	 * EXPECTED: no event
@@ -1290,7 +1290,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			rc = read(fd, buf, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, 1, buf);
@@ -1311,7 +1311,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : read - one-byte read at start of multibyte READ region, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_READ
@@ -1346,7 +1346,7 @@
 			eventExpected = DM_EVENT_READ;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			rc = read(fd, buf, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, 1, buf);
@@ -1412,7 +1412,7 @@
 			eventExpected = DM_EVENT_READ;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			rc = read(fd, buf, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, 1, buf);
@@ -1478,7 +1478,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			rc = read(fd, buf, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, 1, buf);
@@ -1499,7 +1499,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : read - one-byte read one byte before start of one-byte READ region
 	 * EXPECTED: no event
@@ -1530,7 +1530,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			rc = read(fd, buf, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, 1, buf);
@@ -1551,7 +1551,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : read - one-byte read at start/end of one-byte READ region
 	 * EXPECTED: DM_EVENT_READ, DM_RESP_CONTINUE
@@ -1586,7 +1586,7 @@
 			eventExpected = DM_EVENT_READ;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			rc = read(fd, buf, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, 1, buf);
@@ -1673,7 +1673,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : read - one R/W/T region, read from it, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_READ
@@ -1704,7 +1704,7 @@
 			eventExpected = DM_EVENT_READ;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			rc = read(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, DUMMY_STRLEN, buf);
@@ -1772,7 +1772,7 @@
 			eventExpected = DM_EVENT_READ;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			rc = read(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, DUMMY_STRLEN, buf);
@@ -1834,7 +1834,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			rc = read(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, DUMMY_STRLEN, buf);
@@ -1855,7 +1855,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : read - read from different fd than initialized READ region, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_READ
@@ -1886,7 +1886,7 @@
 			eventExpected = DM_EVENT_READ;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			fd2 = open(DummyFile, O_RDWR);
 			rc = fd2 == -1 ? -1 : read(fd2, buf, DUMMY_STRLEN);
@@ -1950,7 +1950,7 @@
 			eventExpected = DM_EVENT_READ;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			eventPending = 1;
 			rc = read(fd, buf, DUMMY_STRLEN);
@@ -2017,7 +2017,7 @@
 			eventExpected = DM_EVENT_READ;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "read(%s)\n", DummyFile);
 			eventPending = 1;
 			rc = read(fd, buf, DUMMY_STRLEN);
@@ -2079,7 +2079,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -2132,7 +2132,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -2259,7 +2259,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -2280,7 +2280,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : write - one TRUNCATE region covering entire file
 	 * EXPECTED: no event
@@ -2312,7 +2312,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -2372,7 +2372,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -2442,7 +2442,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_ABORT;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -2509,7 +2509,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -2530,7 +2530,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : write - two non-WRITE regions covering part of file, write to other
 	 * EXPECTED: no event
@@ -2569,7 +2569,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, DUMMY_STRLEN, buf);
@@ -2632,7 +2632,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -2705,7 +2705,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_ABORT;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -2779,7 +2779,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -2842,7 +2842,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -2915,7 +2915,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_ABORT;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -2983,7 +2983,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3004,7 +3004,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : write - one-byte WRITE region at start of write, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_WRITE
@@ -3040,7 +3040,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3107,7 +3107,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3174,7 +3174,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3195,7 +3195,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : write - one-byte write one byte before start of multibyte WRITE region
 	 * EXPECTED: no event
@@ -3227,7 +3227,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3248,7 +3248,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : write - one-byte write at start of multibyte WRITE region, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_WRITE
@@ -3284,7 +3284,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3351,7 +3351,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3418,7 +3418,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3439,7 +3439,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : write - one-byte write one byte before start of one-byte WRITE region
 	 * EXPECTED: no event
@@ -3471,7 +3471,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3492,7 +3492,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : write - one-byte write at start/end of one-byte WRITE region, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_WRITE
@@ -3528,7 +3528,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3595,7 +3595,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3616,7 +3616,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : write - one R/W/T region, write to it, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_WRITE
@@ -3648,7 +3648,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3717,7 +3717,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3780,7 +3780,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3801,7 +3801,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : write - one WRITE region covering entire file (size 0), write beyond EOF, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_WRITE
@@ -3837,7 +3837,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3904,7 +3904,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			rc = write(fd, buf, DUMMY_STRLEN);
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s) returned %d\n", DummyFile, rc);
@@ -3957,7 +3957,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			fd2 = open(DummyFile, O_RDWR);
 			rc = fd2 == -1 ? -1 : write(fd2, buf, DUMMY_STRLEN);
@@ -4022,7 +4022,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			eventPending = 1;
 			rc = write(fd, buf, DUMMY_STRLEN);
@@ -4087,7 +4087,7 @@
 			eventExpected = DM_EVENT_WRITE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "write(%s)\n", DummyFile);
 			eventPending = 1;
 			rc = write(fd, buf, DUMMY_STRLEN);
@@ -4149,7 +4149,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 5000);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -4202,7 +4202,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 5000);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -4262,7 +4262,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_ABORT;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 5000);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -4323,7 +4323,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 5000);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -4344,7 +4344,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : ftruncate - one WRITE region covering entire file
 	 * EXPECTED: no event
@@ -4376,7 +4376,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 5000);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -4432,7 +4432,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 2222);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -4495,7 +4495,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_ABORT;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 2222);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -4559,7 +4559,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 0);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -4580,7 +4580,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : ftruncate - two non-TRUNCATE regions covering part of file, truncate in other
 	 * EXPECTED: no event
@@ -4615,7 +4615,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 2222);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d, buffer contents [%.*s]\n", DummyFile, rc, DUMMY_STRLEN, buf);
@@ -4674,7 +4674,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 4444);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -4740,7 +4740,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_ABORT;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 4444);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -4807,7 +4807,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 6000);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -4866,7 +4866,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 2997);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -4930,7 +4930,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_ABORT;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 2997);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -4995,7 +4995,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 1997);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -5059,7 +5059,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_ABORT;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 1997);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -5118,7 +5118,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 0);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -5146,7 +5146,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : ftruncate - truncate at start/end of one-byte TRUNCATE region, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_TRUNCATE
@@ -5176,7 +5176,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 1);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -5234,7 +5234,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, 2);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -5255,7 +5255,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : ftruncate - one R/W/T region, truncate in it, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_TRUNCATE
@@ -5285,7 +5285,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, DUMMY_STRLEN/2);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -5349,7 +5349,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, DUMMY_STRLEN/2);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -5407,7 +5407,7 @@
 			eventExpected = DM_EVENT_INVALID;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s)\n", DummyFile);
 			rc = ftruncate(fd, DUMMY_STRLEN/2);
 			DMLOG_PRINT(DMLVL_DEBUG, "ftruncate(%s) returned %d\n", DummyFile, rc);
@@ -5428,7 +5428,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : open with O_TRUNC - one TRUNCATE region covering entire file, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_TRUNCATE
@@ -5454,7 +5454,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "open(%s, O_TRUNC)\n", DummyFile);
 			fd = open(DummyFile, O_RDWR | O_CREAT | O_TRUNC, DUMMY_FILE_RW_MODE);
 			DMLOG_PRINT(DMLVL_DEBUG, "open(%s, O_TRUNC) returned %d\n", DummyFile, fd);
@@ -5509,7 +5509,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "open(%s, O_TRUNC)\n", DummyFile);
 			fd = open(DummyFile, O_RDWR | O_CREAT | O_TRUNC, DUMMY_FILE_RW_MODE);
 			DMLOG_PRINT(DMLVL_DEBUG, "open(%s, O_TRUNC) returned %d\n", DummyFile, fd);
@@ -5564,7 +5564,7 @@
 			eventExpected = DM_EVENT_TRUNCATE;
 			eventReceived = DM_EVENT_INVALID;
 			eventResponse = DM_RESP_CONTINUE;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "creat(%s)\n", DummyFile);
 			fd = creat(DummyFile, S_IRWXU);
 			DMLOG_PRINT(DMLVL_DEBUG, "creat(%s) returned %d\n", DummyFile, fd);
@@ -5607,9 +5607,9 @@
 	}
 
 	remove(DUMMY_FILE);
-		
+	
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -5676,7 +5676,7 @@
 			DMEV_SET(DM_EVENT_PREUNMOUNT, events);
 			DMEV_SET(DM_EVENT_UNMOUNT, events);
 			DMEV_SET(DM_EVENT_POSTCREATE, events);
-			DMEV_SET(DM_EVENT_READ, events);	
+			DMEV_SET(DM_EVENT_READ, events);
 			DMEV_SET(DM_EVENT_WRITE, events);
 			DMEV_SET(DM_EVENT_TRUNCATE, events);
 			rc = dm_set_disp(sid, lhanp, lhlen, token, &events, DM_EVENT_MAX);
@@ -5719,7 +5719,7 @@
 		} else if (type == DM_EVENT_UNMOUNT) {
 			/* SPECIAL CASE: need to set response and bMounted */
 			dm_namesp_event_t *nse = DM_GET_VALUE(dmMsg, ev_data, dm_namesp_event_t *);
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "Message is DM_EVENT_UNMOUNT\n");
 			DMLOG_PRINT(DMLVL_DEBUG, "  Unmount mode: %x\n", nse->ne_mode);
 			DMLOG_PRINT(DMLVL_DEBUG, "  File system handle: %p\n", DM_GET_VALUE(nse, ne_handle1, void *));
@@ -5768,7 +5768,7 @@
 			{
 				dm_data_event_t *de = DM_GET_VALUE(dmMsg, ev_data, dm_data_event_t *);
 				dm_timestruct_t delay;
-				
+			
 				hanp1 = DM_GET_VALUE(de, de_handle, void *);
 				hlen1 = DM_GET_LEN(de, de_handle);
 				offset = de->de_offset;
@@ -5859,4 +5859,4 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/event_sn.c b/testcases/kernel/fs/dmapi/event_sn.c
index 5645fa8..4261e7d 100644
--- a/testcases/kernel/fs/dmapi/event_sn.c
+++ b/testcases/kernel/fs/dmapi/event_sn.c
@@ -75,7 +75,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -110,7 +110,7 @@
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI synchronous namespace event tests\n") ;
-	
+
 	/*
 	 * TEST    : mkdir - DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_CREATE
@@ -150,7 +150,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "Unable to clean up variation! (errno = %d)\n", errno);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mkdir - DM_RESP_ABORT
 	 * EXPECTED: DM_EVENT_CREATE
@@ -185,7 +185,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : rmdir - DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_REMOVE
@@ -492,13 +492,13 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : link - DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_LINK
 	 */
 	if (DMVAR_EXEC(DIR_SYNC_NAMESP_EVENT_BASE + 9)) {
-#ifdef DIRECTORY_LINKS	
+#ifdef DIRECTORY_LINKS
 		dm_ino_t ino1, ino2, ino3;
 		void *hanp;
 		size_t hlen;
@@ -553,7 +553,7 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with DIRECTORY_LINKS defined\n");
-		DMVAR_SKIP();		
+		DMVAR_SKIP();	
 #endif
 	}
 
@@ -562,7 +562,7 @@
 	 * EXPECTED: DM_EVENT_LINK
 	 */
 	if (DMVAR_EXEC(DIR_SYNC_NAMESP_EVENT_BASE + 10)) {
-#ifdef DIRECTORY_LINKS	
+#ifdef DIRECTORY_LINKS
 		dm_ino_t ino1, ino2, ino3;
 		void *hanp;
 		size_t hlen;
@@ -618,8 +618,8 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with DIRECTORY_LINKS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -700,7 +700,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : remove
 	 * EXPECTED: DM_EVENT_REMOVE, DM_RESP_CONTINUE
@@ -1024,7 +1024,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : link
 	 * EXPECTED: DM_EVENT_LINK, DM_RESP_CONTINUE
@@ -1161,7 +1161,7 @@
 	}
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -1269,7 +1269,7 @@
 		} else if (type == DM_EVENT_UNMOUNT) {
 			/* SPECIAL CASE: need to set response and bMounted */
 			dm_namesp_event_t *nse = DM_GET_VALUE(dmMsg, ev_data, dm_namesp_event_t *);
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "Message is DM_EVENT_UNMOUNT\n");
 			DMLOG_PRINT(DMLVL_DEBUG, "  Unmount mode: %x\n", nse->ne_mode);
 			DMLOG_PRINT(DMLVL_DEBUG, "  File system handle: %p\n", DM_GET_VALUE(nse, ne_handle1, void *));
@@ -1392,4 +1392,4 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/event_us.c b/testcases/kernel/fs/dmapi/event_us.c
index a63e289..0d8ee91 100644
--- a/testcases/kernel/fs/dmapi/event_us.c
+++ b/testcases/kernel/fs/dmapi/event_us.c
@@ -73,7 +73,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -106,7 +106,7 @@
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI user event tests\n") ;
 
 	szFuncName = "dm_create_userevent";
-	
+
 	/*
 	 * TEST    : dm_create_uservent - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -124,7 +124,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_create_uservent - invalid msglen
 	 * EXPECTED: rc = -1, errno = E2BIG
@@ -142,7 +142,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_create_uservent - invalid msgdatap
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -159,7 +159,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_create_uservent - invalid tokenp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -178,7 +178,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_create_uservent - valid
 	 * EXPECTED: rc = 0
@@ -201,7 +201,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "Unable to clean up variation! (errno = %d)\n", errno);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_create_uservent - DM_NO_SESSION sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -219,9 +219,9 @@
 
 		/* Variation clean up */
 	}
-	
+
 	szFuncName = "dm_send_msg";
-	
+
 	/*
 	 * TEST    : dm_send_msg - invalid targetsid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -238,7 +238,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_send_msg - invalid msgtype
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -255,7 +255,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_send_msg - invalid buflen
 	 * EXPECTED: rc = -1, errno = E2BIG
@@ -272,7 +272,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_send_msg - invalid bufp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -287,7 +287,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_send_msg - DM_RESP_CONTINUE
 	 * EXPECTED: rc = 0
@@ -321,7 +321,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_send_msg - DM_RESP_ABORT
 	 * EXPECTED: rc = -1, errno = ABORT_ERRNO
@@ -393,7 +393,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_send_msg - DM_NO_SESSION targetsid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -410,9 +410,9 @@
 
 		/* Variation clean up */
 	}
-	
+
 	szFuncName = "dm_find_eventmsg";
-	
+
 	/*
 	 * TEST    : dm_find_eventmsg - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -441,7 +441,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_find_eventmsg - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -470,7 +470,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_find_eventmsg - invalid buflen
 	 * EXPECTED: rc = -1, errno = E2BIG
@@ -516,7 +516,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_find_eventmsg - invalid bufp
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -545,7 +545,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_find_eventmsg - invalid rlenp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -619,7 +619,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_find_eventmsg - DM_NO_SESSION sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -648,7 +648,7 @@
 			}
 		}
 	}
-	
+
 	rc = umount(mountPt);
 	if (rc == -1) {
 		DMLOG_PRINT(DMLVL_ERR, "umount failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -663,7 +663,7 @@
 	}
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -770,7 +770,7 @@
 		} else if (type == DM_EVENT_UNMOUNT) {
 			/* SPECIAL CASE: need to set response and bMounted */
 			dm_namesp_event_t *nse = DM_GET_VALUE(dmMsg, ev_data, dm_namesp_event_t *);
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "Message is DM_EVENT_UNMOUNT\n");
 			DMLOG_PRINT(DMLVL_DEBUG, "  Unmount mode: %x\n", nse->ne_mode);
 			DMLOG_PRINT(DMLVL_DEBUG, "  File system handle: %p\n", DM_GET_VALUE(nse, ne_handle1, void *));
@@ -835,4 +835,4 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/handle.c b/testcases/kernel/fs/dmapi/handle.c
index 06ef368..54f66b5 100644
--- a/testcases/kernel/fs/dmapi/handle.c
+++ b/testcases/kernel/fs/dmapi/handle.c
@@ -71,17 +71,17 @@
 	char *szSessionInfo = "dm_test session info";
 	void *mtpthanp, *curdirhanp;
 	size_t mtpthlen, curdirhlen;
-	
+
 	DMOPT_PARSE(argc, argv);
 	DMLOG_START();
-	
+
 	if ((mountPt = DMOPT_GET("mtpt")) == NULL) {
 		DMLOG_PRINT(DMLVL_ERR, "Missing mount point, use -mtpt (for example, -mtpt /dmapidir)\n");
 		DM_EXIT();
 	} else {
 		DMLOG_PRINT(DMLVL_DEBUG, "Mount point is %s\n", mountPt);
 	}
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -114,7 +114,7 @@
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI handle tests\n") ;
-	
+
 	szFuncName = "dm_path_to_handle";
 
 	/*
@@ -155,7 +155,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_path_to_handle - file in current directory
 	 * EXPECTED: rc = 0
@@ -229,7 +229,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_path_to_handle - directory in current directory
 	 * EXPECTED: rc = 0
@@ -287,7 +287,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_path_to_handle - file in subdirectory
 	 * EXPECTED: rc = 0
@@ -482,7 +482,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(PATH_TO_HANDLE_BASE + 13)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		int	fd;
 		size_t	hlen;
 
@@ -506,8 +506,8 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -537,7 +537,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_path_to_handle - different paths to same file
 	 * EXPECTED: rc = 0
@@ -760,7 +760,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_fd_to_handle - directory fd in current directory
 	 * EXPECTED: rc = 0
@@ -966,7 +966,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(FD_TO_HANDLE_BASE + 9)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		int	fd;
 		size_t	hlen;
 
@@ -990,8 +990,8 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -1146,7 +1146,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_path_to_fshandle - file in current directory
 	 * EXPECTED: rc = 0
@@ -1220,7 +1220,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_path_to_fshandle - directory in current directory
 	 * EXPECTED: rc = 0
@@ -1279,7 +1279,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_path_to_fshandle - file in subdirectory
 	 * EXPECTED: rc = 0
@@ -1474,7 +1474,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(PATH_TO_FSHANDLE_BASE + 13)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		int	fd;
 		size_t	hlen;
 
@@ -1498,8 +1498,8 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -1583,7 +1583,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(HANDLE_TO_FSHANDLE_BASE + 1)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		int	fd;
 		void	*hanp, *fshanp;
 		size_t	hlen, fshlen;
@@ -1614,8 +1614,8 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -1775,7 +1775,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(HANDLE_TO_FSHANDLE_BASE + 6)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		int	fd;
 		void	*hanp;
 		size_t	hlen, fshlen;
@@ -1806,8 +1806,8 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -1815,7 +1815,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(HANDLE_TO_FSHANDLE_BASE + 7)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		int	fd;
 		void	*hanp, *fshanp;
 		size_t	hlen;
@@ -1846,8 +1846,8 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -1859,7 +1859,7 @@
 		size_t	fshlen;
 
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_handle_to_fshandle(DM_GLOBAL_HANP, DM_GLOBAL_HLEN, &fshanp, &fshlen);
@@ -1875,7 +1875,7 @@
 	 * EXPECTED: rc != 0
 	 */
 	if (DMVAR_EXEC(HANDLE_CMP_BASE + 1)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		int	fd;
 		void	*hanp;
 		size_t	hlen;
@@ -1912,8 +1912,8 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -1962,7 +1962,7 @@
 	 * EXPECTED: rc != 0
 	 */
 	if (DMVAR_EXEC(HANDLE_CMP_BASE + 3)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		int	fd;
 		void	*hanp;
 		size_t	hlen;
@@ -1999,8 +1999,8 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -2125,7 +2125,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_cmp - hanp1 == hanp2 (same fs handles)
 	 * EXPECTED: rc = 0
@@ -2572,7 +2572,7 @@
 	 * EXPECTED: return
 	 */
 	if (DMVAR_EXEC(HANDLE_FREE_BASE + 1)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		/* Variation set up */
 
 		/* Variation */
@@ -2584,8 +2584,8 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -2622,7 +2622,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_free - file handle from fd
 	 * EXPECTED: return
@@ -2657,7 +2657,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_free - fs handle from path
 	 * EXPECTED: return
@@ -2692,7 +2692,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_free - fs handle from handle
 	 * EXPECTED: return
@@ -2732,7 +2732,7 @@
 			dm_handle_free(hanp1, hlen1);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_free - file handle from make
 	 * EXPECTED: return
@@ -2779,7 +2779,7 @@
 			dm_handle_free(hanp2, hlen2);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_free - fs handle from make
 	 * EXPECTED: return
@@ -2827,7 +2827,7 @@
 	 * EXPECTED: return
 	 */
 	if (DMVAR_EXEC(HANDLE_FREE_BASE + 8)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		/* Variation set up */
 
 		/* Variation */
@@ -2839,8 +2839,8 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	szFuncName = "dm_handle_is_valid";
@@ -2850,7 +2850,7 @@
 	 * EXPECTED: rc = DM_FALSE
 	 */
 	if (DMVAR_EXEC(HANDLE_IS_VALID_BASE + 1)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		/* Variation set up */
 
 		/* Variation */
@@ -2861,8 +2861,8 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -2899,7 +2899,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-		
+	
 	/*
 	 * TEST    : dm_handle_is_valid - file handle, hlen too small
 	 * EXPECTED: rc = DM_FALSE
@@ -3040,7 +3040,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-		
+	
 	/*
 	 * TEST    : dm_handle_is_valid - fs handle, hlen too small
 	 * EXPECTED: rc = DM_FALSE
@@ -3153,7 +3153,7 @@
 	 */
 	if (DMVAR_EXEC(HANDLE_IS_VALID_BASE + 10)) {
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		bRC = dm_handle_is_valid(DM_GLOBAL_HANP, DM_GLOBAL_HLEN);
@@ -3168,7 +3168,7 @@
 	 */
 	if (DMVAR_EXEC(HANDLE_IS_VALID_BASE + 11)) {
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid handle)\n", szFuncName);
 		bRC = dm_handle_is_valid(DM_INVALID_HANP, DM_INVALID_HLEN);
@@ -3184,7 +3184,7 @@
 	 * EXPECTED: rc = ?
 	 */
 	if (DMVAR_EXEC(HANDLE_HASH_BASE + 1)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		/* Variation set up */
 
 		/* Variation */
@@ -3196,8 +3196,8 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -3277,9 +3277,9 @@
 	 * EXPECTED: rc = ?
 	 */
 	if (DMVAR_EXEC(HANDLE_HASH_BASE + 4)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_handle_hash(DM_GLOBAL_HANP, DM_GLOBAL_HLEN);
@@ -3289,8 +3289,8 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	szFuncName = "dm_handle_to_fsid";
@@ -3300,7 +3300,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(HANDLE_TO_FSID_BASE + 1)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		dm_fsid_t fsidp;
 
 		/* Variation set up */
@@ -3313,8 +3313,8 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -3322,7 +3322,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(HANDLE_TO_FSID_BASE + 2)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		int	fd;
 		void	*hanp;
 		size_t	hlen;
@@ -3353,8 +3353,8 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -3408,7 +3408,7 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_fsid - fs handle
 	 * EXPECTED: rc = 0
@@ -3460,7 +3460,7 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_fsid - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -3485,7 +3485,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(HANDLE_TO_IGEN_BASE + 1)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		dm_igen_t igen;
 
 		/* Variation set up */
@@ -3498,8 +3498,8 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -3507,7 +3507,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(HANDLE_TO_IGEN_BASE + 2)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		int	fd;
 		void	*hanp;
 		size_t	hlen;
@@ -3538,10 +3538,10 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_igen - file handle
 	 * EXPECTED: rc = 0
@@ -3577,7 +3577,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_igen - directory handle
 	 * EXPECTED: rc = 0
@@ -3610,7 +3610,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_igen - fs handle from file
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -3646,7 +3646,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_igen - fs handle from directory
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -3679,7 +3679,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_igen - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -3704,7 +3704,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(HANDLE_TO_INO_BASE + 1)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		dm_ino_t ino;
 
 		/* Variation set up */
@@ -3717,8 +3717,8 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -3726,7 +3726,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(HANDLE_TO_INO_BASE + 2)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		int	fd;
 		void	*hanp;
 		size_t	hlen;
@@ -3757,8 +3757,8 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -3962,7 +3962,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(MAKE_HANDLE_BASE + 1)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		void	*hanp;
 		size_t	hlen;
 		dm_ino_t ino;
@@ -3978,16 +3978,16 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
-	
+
 	/*
 	 * TEST    : dm_make_handle - invalid inop
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(MAKE_HANDLE_BASE + 2)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		void	*hanp;
 		size_t	hlen;
 		dm_fsid_t fsid;
@@ -4003,8 +4003,8 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -4012,7 +4012,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(MAKE_HANDLE_BASE + 3)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		void	*hanp;
 		size_t	hlen;
 		dm_fsid_t fsid;
@@ -4028,8 +4028,8 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -4037,7 +4037,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(MAKE_HANDLE_BASE + 4)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		size_t	hlen;
 		dm_fsid_t fsid;
 		dm_igen_t igen;
@@ -4053,8 +4053,8 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -4062,7 +4062,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(MAKE_HANDLE_BASE + 5)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		void	*hanp;
 		dm_fsid_t fsid;
 		dm_igen_t igen;
@@ -4078,8 +4078,8 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
 
 	/*
@@ -4141,7 +4141,7 @@
 			dm_handle_free(hanp2, hlen2);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_make_handle - directory
 	 * EXPECTED: rc = 0
@@ -4205,7 +4205,7 @@
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(MAKE_FSHANDLE_BASE + 1)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		void	*hanp;
 		size_t	hlen;
 
@@ -4219,16 +4219,16 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
-	
+
 	/*
 	 * TEST    : dm_make_fshandle - invalid hanpp
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(MAKE_FSHANDLE_BASE + 2)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		size_t	hlen;
 		dm_fsid_t fsid;
 
@@ -4242,16 +4242,16 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
-	
+
 	/*
 	 * TEST    : dm_make_fshandle - invalid hlenp
 	 * EXPECTED: rc = -1, errno = EFAULT
 	 */
 	if (DMVAR_EXEC(MAKE_FSHANDLE_BASE + 3)) {
-#ifdef USER_SPACE_FAULTS	
+#ifdef USER_SPACE_FAULTS
 		void	*hanp;
 		dm_fsid_t fsid;
 
@@ -4265,10 +4265,10 @@
 		/* Variation clean up */
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with USER_SPACE_FAULTS defined\n");
-		DMVAR_SKIP();		
-#endif	
+		DMVAR_SKIP();	
+#endif
 	}
-	
+
 	/*
 	 * TEST    : dm_make_fshandle - file handle
 	 * EXPECTED: rc = 0
@@ -4419,7 +4419,7 @@
 			dm_handle_free(targhanp, targhlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_path - invalid dirhlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -4460,7 +4460,7 @@
 			dm_handle_free(targhanp, targhlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_path - invalid targhanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -4501,7 +4501,7 @@
 			dm_handle_free(targhanp, targhlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_path - invalid targhlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -4841,7 +4841,7 @@
 			rc = dm_handle_to_path(dirhanp, dirhlen, targhanp, targhlen, sizeof(pathbuf), pathbuf, &rlen);
 			if (rc == 0) {
 				DMLOG_PRINT(DMLVL_DEBUG, "rlen = %d, pathbuf = \"%s\"\n", rlen, pathbuf);
-				
+			
 				if (strncmp(pathbuf, DUMMY_FILE, rlen) == 0) {
 					*(pathbuf+rlen) = 0;
 				  	DMLOG_PRINT(DMLVL_DEBUG, "%s passed with expected rc = %d and path = %s (length %d)\n", szFuncName, rc, pathbuf, rlen);
@@ -4900,7 +4900,7 @@
 			rc = dm_handle_to_path(dirhanp, dirhlen, targhanp, targhlen, sizeof(pathbuf), pathbuf, &rlen);
 			if (rc == 0) {
 				DMLOG_PRINT(DMLVL_DEBUG, "rlen = %d, pathbuf = \"%s\"\n", rlen, pathbuf);
-				
+			
 				if (strncmp(pathbuf, DUMMY_SUBDIR_FILE, rlen) == 0) {
 					*(pathbuf+rlen) = 0;
 				  	DMLOG_PRINT(DMLVL_DEBUG, "%s passed with expected rc = %d and path = %s (length %d)\n", szFuncName, rc, pathbuf, rlen);
@@ -4966,7 +4966,7 @@
 			rc = dm_handle_to_path(dirhanp, dirhlen, targhanp, targhlen, sizeof(pathbuf), pathbuf, &rlen);
 			if (rc == 0) {
 				DMLOG_PRINT(DMLVL_DEBUG, "rlen = %d, pathbuf = \"%s\"\n", rlen, pathbuf);
-				
+			
 				if (strncmp(pathbuf, DUMMY_SUBDIR_LINK, rlen) == 0) {
 					*(pathbuf+rlen) = 0;
 				  	DMLOG_PRINT(DMLVL_DEBUG, "%s passed with expected rc = %d and path = %s (length %d)\n", szFuncName, rc, pathbuf, rlen);
@@ -5045,7 +5045,7 @@
 			rc = dm_handle_to_path(dirhanp, dirhlen, targhanp, targhlen, sizeof(pathbuf), pathbuf, &rlen);
 			if (rc == 0) {
 				DMLOG_PRINT(DMLVL_DEBUG, "rlen = %d, pathbuf = \"%s\"\n", rlen, pathbuf);
-				
+			
 				if (strncmp(pathbuf, FILE_LEVEL4, rlen) == 0) {
 					*(pathbuf+rlen) = 0;
 				  	DMLOG_PRINT(DMLVL_DEBUG, "%s passed with expected rc = %d and path = %s (length %d)\n", szFuncName, rc, pathbuf, rlen);
@@ -5181,7 +5181,7 @@
 			dm_handle_free(targhanp, targhlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_path - fs targhanp
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -5222,7 +5222,7 @@
 			dm_handle_free(targhanp, targhlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_path - global dirhanp
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -5259,7 +5259,7 @@
 			dm_handle_free(targhanp, targhlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_path - global targhanp
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -5285,7 +5285,7 @@
 			dm_handle_free(dirhanp, dirhlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_handle_to_path - invalidated dirhanp
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -5390,7 +5390,7 @@
 	}
 
 	szFuncName = "dm_sync_by_handle";
-	
+
 	/*
 	 * TEST    : dm_sync_by_handle - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -5726,7 +5726,7 @@
 	dm_handle_free(curdirhanp, curdirhlen);
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/hole.c b/testcases/kernel/fs/dmapi/hole.c
index 3527743..2d8b5dd 100644
--- a/testcases/kernel/fs/dmapi/hole.c
+++ b/testcases/kernel/fs/dmapi/hole.c
@@ -45,15 +45,15 @@
 
 void LogExtents(dm_extent_t *pext, u_int nelem)
 {
-	
+
 	int i;
-	
+
 	DMLOG_PRINT(DMLVL_DEBUG, "Extents:\n");
 	for (i = 0; i < nelem; i++, pext++) {
 		DMLOG_PRINT(DMLVL_DEBUG, "  extent %d: type %d, offset %lld, length %lld\n", i + 1, pext->ex_type, pext->ex_offset, pext->ex_length);
 	}
-	
-}		
+
+}	
 
 int main(int argc, char **argv)
 {
@@ -83,7 +83,7 @@
 				if (write(fd, DUMMY_STRING, DUMMY_STRLEN) != DUMMY_STRLEN) {
 					rc = -1;
 					break;
-				}					
+				}				
 			}
 		} else {
 			rc = -1;
@@ -99,9 +99,9 @@
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI file hole tests\n") ;
-	
+
 	szFuncName = "dm_get_allocinfo";
-	
+
 	/*
 	 * TEST    : dm_get_allocinfo - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1016,7 +1016,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_allocinfo - DM_NO_SESSION sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1100,7 +1100,7 @@
 		u_int nelem;
 
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_get_allocinfo(sid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, &off, NUM_EXTENTS, Extents, &nelem);
@@ -1150,7 +1150,7 @@
 	}
 
 	szFuncName = "dm_probe_hole";
-	
+
 	/*
 	 * TEST    : dm_probe_hole - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1623,7 +1623,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_probe_hole - end of file with rounding
 	 * EXPECTED: rc = 0
@@ -1681,7 +1681,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_probe_hole - middle of file without rounding
 	 * EXPECTED: rc = 0
@@ -1741,10 +1741,10 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with INTERIOR_HOLES defined\n");
-		DMVAR_SKIP();		
+		DMVAR_SKIP();	
 #endif
 	}
-	
+
 	/*
 	 * TEST    : dm_probe_hole - middle of file with rounding, large
 	 * EXPECTED: rc = 0
@@ -1804,10 +1804,10 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with INTERIOR_HOLES defined\n");
-		DMVAR_SKIP();		
+		DMVAR_SKIP();	
 #endif
 	}
-	
+
 	/*
 	 * TEST    : dm_probe_hole - middle of file with rounding, small
 	 * EXPECTED: rc = 0
@@ -1867,10 +1867,10 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with INTERIOR_HOLES defined\n");
-		DMVAR_SKIP();		
+		DMVAR_SKIP();	
 #endif
 	}
-	
+
 	/*
 	 * TEST    : dm_probe_hole - middle of file with rounding, no hole
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1912,7 +1912,7 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with INTERIOR_HOLES defined\n");
-		DMVAR_SKIP();		
+		DMVAR_SKIP();	
 #endif
 	}
 
@@ -1999,7 +1999,7 @@
 		dm_size_t inlen = 0, outlen;
 
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_probe_hole(sid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, inoff, inlen, &outoff, &outlen);
@@ -2049,7 +2049,7 @@
 	}
 
 	szFuncName = "dm_punch_hole";
-	
+
 	/*
 	 * TEST    : dm_punch_hole - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -2443,7 +2443,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_punch_hole - truncate entire file
 	 * EXPECTED: rc = 0, nelem = 0
@@ -2634,7 +2634,7 @@
 	 * EXPECTED: rc = 0, nelem = 3
 	 */
 	if (DMVAR_EXEC(PUNCH_HOLE_BASE + 14)) {
-#ifdef INTERIOR_HOLES	
+#ifdef INTERIOR_HOLES
 		int fd;
 		void *hanp;
 		size_t hlen;
@@ -2699,7 +2699,7 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with INTERIOR_HOLES defined\n");
-		DMVAR_SKIP();		
+		DMVAR_SKIP();	
 #endif
 	}
 
@@ -2708,7 +2708,7 @@
 	 * EXPECTED: rc = 0, nelem = 3
 	 */
 	if (DMVAR_EXEC(PUNCH_HOLE_BASE + 15)) {
-#ifdef INTERIOR_HOLES	
+#ifdef INTERIOR_HOLES
 		int fd;
 		void *hanp;
 		size_t hlen;
@@ -2766,7 +2766,7 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with INTERIOR_HOLES defined\n");
-		DMVAR_SKIP();		
+		DMVAR_SKIP();	
 #endif
 	}
 
@@ -2853,7 +2853,7 @@
 		dm_size_t len = 0;
 
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_punch_hole(sid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, off, len);
@@ -3646,6 +3646,6 @@
 	remove(DUMMY_TMP);
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
diff --git a/testcases/kernel/fs/dmapi/invis.c b/testcases/kernel/fs/dmapi/invis.c
index 4ed39a2..31392e5 100644
--- a/testcases/kernel/fs/dmapi/invis.c
+++ b/testcases/kernel/fs/dmapi/invis.c
@@ -61,7 +61,7 @@
 
 void LogStat(struct stat *statfs)
 {
-	
+
 	DMLOG_PRINT(DMLVL_DEBUG, "  st_dev %d\n", statfs->st_dev);
 	DMLOG_PRINT(DMLVL_DEBUG, "  st_ino %d\n", statfs->st_ino);
 	DMLOG_PRINT(DMLVL_DEBUG, "  st_mode 0x%x\n", statfs->st_mode);
@@ -76,7 +76,7 @@
 	DMLOG_PRINT(DMLVL_DEBUG, "  st_mtime %d\n", statfs->st_mtime);
 	DMLOG_PRINT(DMLVL_DEBUG, "  st_ctime %d\n", statfs->st_ctime);
 
-}	
+}
 
 /*
  * StatCmp is used instead of memcmp because some of the pad fields or unused
@@ -84,7 +84,7 @@
  */
 int StatCmp(struct stat *stat1, struct stat *stat2)
 {
-	
+
 	if ((stat1->st_dev != stat2->st_dev) ||
 	    (stat1->st_ino != stat2->st_ino) ||
 	    (stat1->st_mode != stat2->st_mode) ||
@@ -103,7 +103,7 @@
 		return 0;
 	}
 
-}	
+}
 
 int main(int argc, char **argv)
 {
@@ -120,7 +120,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -142,7 +142,7 @@
 		DM_EXIT();
 	} else {
 		int fd;
-		
+	
 		sprintf(DummyFile, "%s/%s", mountPt, DUMMY_FILE);
 		sprintf(DummySubdir, "%s/%s", mountPt, DUMMY_SUBDIR);
 		sprintf(DummyTmp, "%s/%s", mountPt, DUMMY_TMP);
@@ -159,7 +159,7 @@
 				if (write(fd, DUMMY_STRING, DUMMY_STRLEN) != DUMMY_STRLEN) {
 					rc = -1;
 					break;
-				}					
+				}				
 			}
 		} else {
 			rc = -1;
@@ -200,15 +200,15 @@
 	DMEV_SET(DM_EVENT_SYMLINK, maxFileEvents);
 	DMEV_SET(DM_EVENT_POSTSYMLINK, maxFileEvents);
 	DMEV_SET(DM_EVENT_ATTRIBUTE, maxFileEvents);
-	
+
 	DMEV_ZERO(minFileEvents);
 	DMEV_SET(DM_EVENT_PREUNMOUNT, minFileEvents);
 	DMEV_SET(DM_EVENT_UNMOUNT, minFileEvents);
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI invisible read/write tests\n") ;
-	
+
 	szFuncName = "dm_read_invis";
-	
+
 	/*
 	 * TEST    : dm_read_invis - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -474,7 +474,7 @@
 			dm_set_eventlist(sid, fshanp, fshlen, DM_NO_TOKEN, &minFileEvents, DM_EVENT_MAX);
 			if (rc == inlen) {
 				DMLOG_PRINT(DMLVL_DEBUG, "read %d bytes\n", rc);
-				if (memcmp(buf, DUMMY_STRING, DUMMY_STRLEN) == 0) {	
+				if (memcmp(buf, DUMMY_STRING, DUMMY_STRLEN) == 0) {
 					DMLOG_PRINT(DMLVL_DEBUG, "buffer contents [%.*s]\n", rc, buf);
 					if (eventReceived == DM_EVENT_INVALID) {
 						DMLOG_PRINT(DMLVL_DEBUG, "no event received\n");
@@ -488,7 +488,7 @@
 							DMLOG_PRINT(DMLVL_DEBUG, "stat info after:\n");
 							LogStat(&statfs2);
 							DMVAR_FAIL();
-						}			
+						}		
 					} else {
 						DMLOG_PRINT(DMLVL_ERR, "event %d received!\n", eventReceived);
 						DMVAR_FAIL();
@@ -559,7 +559,7 @@
 			dm_set_eventlist(sid, fshanp, fshlen, DM_NO_TOKEN, &minFileEvents, DM_EVENT_MAX);
 			if (rc == inlen) {
 				DMLOG_PRINT(DMLVL_DEBUG, "read %d bytes\n", rc);
-				if (memcmp(buf, DUMMY_STRING, DUMMY_STRLEN) == 0) {	
+				if (memcmp(buf, DUMMY_STRING, DUMMY_STRLEN) == 0) {
 					DMLOG_PRINT(DMLVL_DEBUG, "buffer contents [%.*s]\n", rc, buf);
 					if (eventReceived == DM_EVENT_INVALID) {
 						DMLOG_PRINT(DMLVL_DEBUG, "no event received\n");
@@ -573,7 +573,7 @@
 							DMLOG_PRINT(DMLVL_DEBUG, "stat info after:\n");
 							LogStat(&statfs2);
 							DMVAR_FAIL();
-						}			
+						}		
 					} else {
 						DMLOG_PRINT(DMLVL_ERR, "event %d received!\n", eventReceived);
 						DMVAR_FAIL();
@@ -596,7 +596,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_read_invis - file end
 	 * EXPECTED: rc = DUMMY_STRLEN
@@ -644,7 +644,7 @@
 			dm_set_eventlist(sid, fshanp, fshlen, DM_NO_TOKEN, &minFileEvents, DM_EVENT_MAX);
 			if (rc == inlen) {
 				DMLOG_PRINT(DMLVL_DEBUG, "read %d bytes\n", rc);
-				if (memcmp(buf, DUMMY_STRING, DUMMY_STRLEN) == 0) {	
+				if (memcmp(buf, DUMMY_STRING, DUMMY_STRLEN) == 0) {
 					DMLOG_PRINT(DMLVL_DEBUG, "buffer contents [%.*s]\n", rc, buf);
 					if (eventReceived == DM_EVENT_INVALID) {
 						DMLOG_PRINT(DMLVL_DEBUG, "no event received\n");
@@ -658,7 +658,7 @@
 							DMLOG_PRINT(DMLVL_DEBUG, "stat info after:\n");
 							LogStat(&statfs2);
 							DMVAR_FAIL();
-						}			
+						}		
 					} else {
 						DMLOG_PRINT(DMLVL_ERR, "event %d received!\n", eventReceived);
 						DMVAR_FAIL();
@@ -681,7 +681,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_read_invis - overlaps file end
 	 * EXPECTED: rc = DUMMY_STRLEN/2
@@ -729,7 +729,7 @@
 			dm_set_eventlist(sid, fshanp, fshlen, DM_NO_TOKEN, &minFileEvents, DM_EVENT_MAX);
 			if (rc == DUMMY_STRLEN/2) {
 				DMLOG_PRINT(DMLVL_DEBUG, "read %d bytes\n", rc);
-				if (memcmp(buf, DummyString+(DUMMY_STRLEN/2), DUMMY_STRLEN/2) == 0) {	
+				if (memcmp(buf, DummyString+(DUMMY_STRLEN/2), DUMMY_STRLEN/2) == 0) {
 					DMLOG_PRINT(DMLVL_DEBUG, "buffer contents [%.*s]\n", rc, buf);
 					if (eventReceived == DM_EVENT_INVALID) {
 						DMLOG_PRINT(DMLVL_DEBUG, "no event received\n");
@@ -743,7 +743,7 @@
 							DMLOG_PRINT(DMLVL_DEBUG, "stat info after:\n");
 							LogStat(&statfs2);
 							DMVAR_FAIL();
-						}			
+						}		
 					} else {
 						DMLOG_PRINT(DMLVL_ERR, "event %d received!\n", eventReceived);
 						DMVAR_FAIL();
@@ -766,7 +766,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_read_invis - DM_NO_SESSION sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -883,7 +883,7 @@
 		char buf[DUMMY_STRLEN];
 
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_read_invis(sid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, inoff, inlen, buf);
@@ -928,7 +928,7 @@
 	}
 
 	szFuncName = "dm_write_invis";
-	
+
 	/*
 	 * TEST    : dm_write_invis - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1197,7 +1197,7 @@
 			dm_set_eventlist(sid, fshanp, fshlen, DM_NO_TOKEN, &minFileEvents, DM_EVENT_MAX);
 			if (rc == outlen) {
 				DMLOG_PRINT(DMLVL_DEBUG, "wrote %d bytes\n", rc);
-				if ((rc2 == 0) && (lseek(fd, outoff, SEEK_SET) == outoff) && (read(fd, buf, DUMMY_STRLEN) == outlen) && (memcmp(buf, DUMMY_STRING2, DUMMY_STRLEN) == 0)) {	
+				if ((rc2 == 0) && (lseek(fd, outoff, SEEK_SET) == outoff) && (read(fd, buf, DUMMY_STRLEN) == outlen) && (memcmp(buf, DUMMY_STRING2, DUMMY_STRLEN) == 0)) {
 					DMLOG_PRINT(DMLVL_DEBUG, "buffer contents [%.*s]\n", rc, buf);
 					if (eventReceived == DM_EVENT_INVALID) {
 						DMLOG_PRINT(DMLVL_DEBUG, "no event received\n");
@@ -1211,7 +1211,7 @@
 							DMLOG_PRINT(DMLVL_DEBUG, "stat info after:\n");
 							LogStat(&statfs2);
 							DMVAR_FAIL();
-						}			
+						}		
 					} else {
 						DMLOG_PRINT(DMLVL_ERR, "event %d received!\n", eventReceived);
 						DMVAR_FAIL();
@@ -1289,7 +1289,7 @@
 			dm_set_eventlist(sid, fshanp, fshlen, DM_NO_TOKEN, &minFileEvents, DM_EVENT_MAX);
 			if (rc == outlen) {
 				DMLOG_PRINT(DMLVL_DEBUG, "wrote %d bytes\n", rc);
-				if ((rc2 == 0) && (lseek(fd, outoff, SEEK_SET) == outoff) && (read(fd, buf, DUMMY_STRLEN) == outlen) && (memcmp(buf, DUMMY_STRING2, DUMMY_STRLEN) == 0)) {	
+				if ((rc2 == 0) && (lseek(fd, outoff, SEEK_SET) == outoff) && (read(fd, buf, DUMMY_STRLEN) == outlen) && (memcmp(buf, DUMMY_STRING2, DUMMY_STRLEN) == 0)) {
 					DMLOG_PRINT(DMLVL_DEBUG, "buffer contents [%.*s]\n", rc, buf);
 					if (eventReceived == DM_EVENT_INVALID) {
 						DMLOG_PRINT(DMLVL_DEBUG, "no event received\n");
@@ -1303,7 +1303,7 @@
 							DMLOG_PRINT(DMLVL_DEBUG, "stat info after:\n");
 							LogStat(&statfs2);
 							DMVAR_FAIL();
-						}			
+						}		
 					} else {
 						DMLOG_PRINT(DMLVL_ERR, "event %d received!\n", eventReceived);
 						DMVAR_FAIL();
@@ -1327,7 +1327,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_write_invis - file end, async
 	 * EXPECTED: rc = DUMMY_STRLEN
@@ -1381,7 +1381,7 @@
 			dm_set_eventlist(sid, fshanp, fshlen, DM_NO_TOKEN, &minFileEvents, DM_EVENT_MAX);
 			if (rc == outlen) {
 				DMLOG_PRINT(DMLVL_DEBUG, "wrote %d bytes\n", rc);
-				if ((rc2 == 0) && (lseek(fd, outoff, SEEK_SET) == outoff) && (read(fd, buf, DUMMY_STRLEN) == outlen) && (memcmp(buf, DUMMY_STRING2, DUMMY_STRLEN) == 0)) {	
+				if ((rc2 == 0) && (lseek(fd, outoff, SEEK_SET) == outoff) && (read(fd, buf, DUMMY_STRLEN) == outlen) && (memcmp(buf, DUMMY_STRING2, DUMMY_STRLEN) == 0)) {
 					DMLOG_PRINT(DMLVL_DEBUG, "buffer contents [%.*s]\n", rc, buf);
 					if (eventReceived == DM_EVENT_INVALID) {
 						DMLOG_PRINT(DMLVL_DEBUG, "no event received\n");
@@ -1395,7 +1395,7 @@
 							DMLOG_PRINT(DMLVL_DEBUG, "stat info after:\n");
 							LogStat(&statfs2);
 							DMVAR_FAIL();
-						}			
+						}		
 					} else {
 						DMLOG_PRINT(DMLVL_ERR, "event %d received!\n", eventReceived);
 						DMVAR_FAIL();
@@ -1419,7 +1419,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_write_invis - file start, sync
 	 * EXPECTED: rc = DUMMY_STRLEN
@@ -1473,7 +1473,7 @@
 			dm_set_eventlist(sid, fshanp, fshlen, DM_NO_TOKEN, &minFileEvents, DM_EVENT_MAX);
 			if (rc == outlen) {
 				DMLOG_PRINT(DMLVL_DEBUG, "wrote %d bytes\n", rc);
-				if ((rc2 == 0) && (lseek(fd, outoff, SEEK_SET) == outoff) && (read(fd, buf, DUMMY_STRLEN) == outlen) && (memcmp(buf, DUMMY_STRING2, DUMMY_STRLEN) == 0)) {	
+				if ((rc2 == 0) && (lseek(fd, outoff, SEEK_SET) == outoff) && (read(fd, buf, DUMMY_STRLEN) == outlen) && (memcmp(buf, DUMMY_STRING2, DUMMY_STRLEN) == 0)) {
 					DMLOG_PRINT(DMLVL_DEBUG, "buffer contents [%.*s]\n", rc, buf);
 					if (eventReceived == DM_EVENT_INVALID) {
 						DMLOG_PRINT(DMLVL_DEBUG, "no event received\n");
@@ -1487,7 +1487,7 @@
 							DMLOG_PRINT(DMLVL_DEBUG, "stat info after:\n");
 							LogStat(&statfs2);
 							DMVAR_FAIL();
-						}			
+						}		
 					} else {
 						DMLOG_PRINT(DMLVL_ERR, "event %d received!\n", eventReceived);
 						DMVAR_FAIL();
@@ -1565,7 +1565,7 @@
 			dm_set_eventlist(sid, fshanp, fshlen, DM_NO_TOKEN, &minFileEvents, DM_EVENT_MAX);
 			if (rc == outlen) {
 				DMLOG_PRINT(DMLVL_DEBUG, "wrote %d bytes\n", rc);
-				if ((rc2 == 0) && (lseek(fd, outoff, SEEK_SET) == outoff) && (read(fd, buf, DUMMY_STRLEN) == outlen) && (memcmp(buf, DUMMY_STRING2, DUMMY_STRLEN) == 0)) {	
+				if ((rc2 == 0) && (lseek(fd, outoff, SEEK_SET) == outoff) && (read(fd, buf, DUMMY_STRLEN) == outlen) && (memcmp(buf, DUMMY_STRING2, DUMMY_STRLEN) == 0)) {
 					DMLOG_PRINT(DMLVL_DEBUG, "buffer contents [%.*s]\n", rc, buf);
 					if (eventReceived == DM_EVENT_INVALID) {
 						DMLOG_PRINT(DMLVL_DEBUG, "no event received\n");
@@ -1579,7 +1579,7 @@
 							DMLOG_PRINT(DMLVL_DEBUG, "stat info after:\n");
 							LogStat(&statfs2);
 							DMVAR_FAIL();
-						}			
+						}		
 					} else {
 						DMLOG_PRINT(DMLVL_ERR, "event %d received!\n", eventReceived);
 						DMVAR_FAIL();
@@ -1603,7 +1603,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_write_invis - file end, sync
 	 * EXPECTED: rc = DUMMY_STRLEN
@@ -1657,7 +1657,7 @@
 			dm_set_eventlist(sid, fshanp, fshlen, DM_NO_TOKEN, &minFileEvents, DM_EVENT_MAX);
 			if (rc == outlen) {
 				DMLOG_PRINT(DMLVL_DEBUG, "wrote %d bytes\n", rc);
-				if ((rc2 == 0) && (lseek(fd, outoff, SEEK_SET) == outoff) && (read(fd, buf, DUMMY_STRLEN) == outlen) && (memcmp(buf, DUMMY_STRING2, DUMMY_STRLEN) == 0)) {	
+				if ((rc2 == 0) && (lseek(fd, outoff, SEEK_SET) == outoff) && (read(fd, buf, DUMMY_STRLEN) == outlen) && (memcmp(buf, DUMMY_STRING2, DUMMY_STRLEN) == 0)) {
 					DMLOG_PRINT(DMLVL_DEBUG, "buffer contents [%.*s]\n", rc, buf);
 					if (eventReceived == DM_EVENT_INVALID) {
 						DMLOG_PRINT(DMLVL_DEBUG, "no event received\n");
@@ -1671,7 +1671,7 @@
 							DMLOG_PRINT(DMLVL_DEBUG, "stat info after:\n");
 							LogStat(&statfs2);
 							DMVAR_FAIL();
-						}			
+						}		
 					} else {
 						DMLOG_PRINT(DMLVL_ERR, "event %d received!\n", eventReceived);
 						DMVAR_FAIL();
@@ -1812,7 +1812,7 @@
 		char buf[DUMMY_STRLEN];
 
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(global handle)\n", szFuncName);
 		rc = dm_write_invis(sid, DM_GLOBAL_HANP, DM_GLOBAL_HLEN, DM_NO_TOKEN, 0, inoff, inlen, buf);
@@ -1856,7 +1856,7 @@
 	}
 
 	remove(DummyTmp);
-	
+
 	rc = umount(mountPt);
 	if (rc == -1) {
 		DMLOG_PRINT(DMLVL_ERR, "umount failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -1870,7 +1870,7 @@
 	}
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -1947,7 +1947,7 @@
 			DMEV_SET(DM_EVENT_POSTLINK, events);
 			DMEV_SET(DM_EVENT_SYMLINK, events);
 			DMEV_SET(DM_EVENT_POSTSYMLINK, events);
-			DMEV_SET(DM_EVENT_READ, events);	
+			DMEV_SET(DM_EVENT_READ, events);
 			DMEV_SET(DM_EVENT_WRITE, events);
 			DMEV_SET(DM_EVENT_TRUNCATE, events);
 			DMEV_SET(DM_EVENT_ATTRIBUTE, events);
@@ -1991,7 +1991,7 @@
 		} else if (type == DM_EVENT_UNMOUNT) {
 			/* SPECIAL CASE: need to set response and bMounted */
 			dm_namesp_event_t *nse = DM_GET_VALUE(dmMsg, ev_data, dm_namesp_event_t *);
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "Message is DM_EVENT_UNMOUNT\n");
 			DMLOG_PRINT(DMLVL_DEBUG, "  Unmount mode: %x\n", nse->ne_mode);
 			DMLOG_PRINT(DMLVL_DEBUG, "  File system handle: %p\n", DM_GET_VALUE(nse, ne_handle1, void *));
@@ -2075,7 +2075,7 @@
 			case DM_EVENT_CLOSE:
 				response = DM_RESP_INVALID;
 				break;
-				
+			
 			default:
 			{
 				DMLOG_PRINT(DMLVL_ERR, "Message is unexpected!\n");
@@ -2092,4 +2092,4 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/mmap.c b/testcases/kernel/fs/dmapi/mmap.c
index fd9c979..a6879cd 100644
--- a/testcases/kernel/fs/dmapi/mmap.c
+++ b/testcases/kernel/fs/dmapi/mmap.c
@@ -72,7 +72,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -107,7 +107,7 @@
 				if (write(fd, DUMMY_STRING, DUMMY_STRLEN) != DUMMY_STRLEN) {
 					rc = -1;
 					break;
-				}					
+				}				
 			}
 		} else {
 			rc = -1;
@@ -126,7 +126,7 @@
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI memory mapped file synchronous event data tests\n") ;
-	
+
 	/*
 	 * TEST    : mmap - no regions
 	 * EXPECTED: no event
@@ -174,7 +174,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_REGION_WRITE
 	 * EXPECTED: no event
@@ -230,7 +230,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_REGION_TRUNCATE
 	 * EXPECTED: no event
@@ -286,7 +286,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_EVENT_READ, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_READ
@@ -355,7 +355,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_EVENT_READ, DM_RESP_ABORT
 	 * EXPECTED: DM_EVENT_READ
@@ -421,7 +421,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_EVENT_READ
 	 * EXPECTED: no event
@@ -477,7 +477,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_EVENT_READ
 	 * EXPECTED: no event
@@ -533,7 +533,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_EVENT_READ
 	 * EXPECTED: DM_EVENT_READ
@@ -599,7 +599,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_EVENT_READ
 	 * EXPECTED: no event
@@ -655,7 +655,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - no regions
 	 * EXPECTED: no event
@@ -703,7 +703,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_REGION_READ
 	 * EXPECTED: no event
@@ -759,7 +759,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_REGION_TRUNCATE
 	 * EXPECTED: no event
@@ -815,7 +815,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_EVENT_WRITE, DM_RESP_CONTINUE
 	 * EXPECTED: DM_EVENT_WRITE
@@ -881,7 +881,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_EVENT_WRITE, DM_RESP_ABORT
 	 * EXPECTED: DM_EVENT_WRITE
@@ -947,7 +947,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_EVENT_WRITE
 	 * EXPECTED: no event
@@ -1003,7 +1003,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_EVENT_WRITE
 	 * EXPECTED: no event
@@ -1059,7 +1059,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_EVENT_WRITE
 	 * EXPECTED: DM_EVENT_WRITE
@@ -1125,7 +1125,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : mmap - one region, DM_EVENT_WRITE
 	 * EXPECTED: no event
@@ -1181,10 +1181,10 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	remove(DummyFile);
 	remove(DummyTmp);
-		
+	
 	rc = umount(mountPt);
 	if (rc == -1) {
 		DMLOG_PRINT(DMLVL_ERR, "umount failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -1198,7 +1198,7 @@
 	}
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -1305,7 +1305,7 @@
 			case DM_EVENT_PREUNMOUNT:
 				response = DM_RESP_CONTINUE;
 				break;
-				
+			
 			case DM_EVENT_READ:
 			{
 				dm_data_event_t *de = DM_GET_VALUE(dmMsg, ev_data, dm_data_event_t *);
@@ -1358,4 +1358,4 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/mmapfile.c b/testcases/kernel/fs/dmapi/mmapfile.c
index 0f76f8e..d4aaf15 100644
--- a/testcases/kernel/fs/dmapi/mmapfile.c
+++ b/testcases/kernel/fs/dmapi/mmapfile.c
@@ -60,7 +60,7 @@
 	int passflag;
 	int flags;
 	void *memmap;
-	
+
 	if (--argc != 5) {
 		printf("usage: %s filename openflags offset length passflag\n", argv[0]);
 		exit(-1);
@@ -71,7 +71,7 @@
 		printf("%s error: invalid passflag %s\n", argv[0], argv[5]);
 		exit(-1);
 	}
-	
+
 	length = atoi(argv[4]);
 	if (length < 0) {
 		printf("%s error: invalid length %s\n", argv[0], argv[4]);
@@ -127,5 +127,5 @@
 	close(fd);
 
 	_exit(0);
-	return 0;	
+	return 0;
 }
diff --git a/testcases/kernel/fs/dmapi/mount.c b/testcases/kernel/fs/dmapi/mount.c
index 970c904..a03e9de 100644
--- a/testcases/kernel/fs/dmapi/mount.c
+++ b/testcases/kernel/fs/dmapi/mount.c
@@ -62,7 +62,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -91,9 +91,9 @@
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI mount tests\n") ;
-	
+
 	szFuncName = "dm_set_dmattr";
-	
+
 	/*
 	 * TEST    : dm_get_mountinfo - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -130,7 +130,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_mountinfo - invalid hanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -167,7 +167,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_mountinfo - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -204,7 +204,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_mountinfo - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -241,7 +241,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_mountinfo - invalid buflen
 	 * EXPECTED: rc = -1, errno = E2BIG
@@ -295,7 +295,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_mountinfo - invalid bufp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -332,7 +332,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_mountinfo - invalid rlenp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -368,7 +368,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_mountinfo - valid
 	 * EXPECTED: rc = 0
@@ -458,7 +458,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_mountinfo - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -476,7 +476,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_get_mountinfo - file handle
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -513,7 +513,7 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_get_mountinfo - dir handle
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -547,11 +547,11 @@
 			dm_handle_free(hanp, hlen);
 		}
 	}
-	
+
 	if (me_ptr != NULL) {
 		free(me_ptr);
 	}
-	
+
 	rc = umount(mountPt);
 	if (rc == -1) {
 		DMLOG_PRINT(DMLVL_ERR, "umount failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -565,7 +565,7 @@
 	}
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -673,7 +673,7 @@
 			case DM_EVENT_PREUNMOUNT:
 				response = DM_RESP_CONTINUE;
 				break;
-				
+			
 			default:
 			{
 				DMLOG_PRINT(DMLVL_ERR, "Message is unexpected!\n");
@@ -690,4 +690,4 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/objref.c b/testcases/kernel/fs/dmapi/objref.c
index 256c9d0..e13c9e2 100644
--- a/testcases/kernel/fs/dmapi/objref.c
+++ b/testcases/kernel/fs/dmapi/objref.c
@@ -59,7 +59,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -111,7 +111,7 @@
 	}
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -122,9 +122,9 @@
 	int   rc;
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI object reference tests\n") ;
-	
+
 	szFuncName = "dm_obj_ref_hold";
-	
+
 	/*
 	 * TEST    : dm_obj_ref_hold - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -140,7 +140,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_obj_ref_hold - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -156,7 +156,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_obj_ref_hold - invalid hanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -172,7 +172,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_obj_ref_hold - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -258,7 +258,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_obj_ref_hold - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -274,9 +274,9 @@
 
 		/* Variation clean up */
 	}
-	
+
 	szFuncName = "dm_obj_ref_rele";
-	
+
 	/*
 	 * TEST    : dm_obj_ref_rele - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -292,7 +292,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_obj_ref_rele - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -308,7 +308,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_obj_ref_rele - invalid hanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -324,7 +324,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_obj_ref_rele - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -340,7 +340,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_obj_ref_rele - no hold
 	 * EXPECTED: rc = -1, errno = EACCES
@@ -403,7 +403,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_obj_ref_rele - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -419,9 +419,9 @@
 
 		/* Variation clean up */
 	}
-	
+
 	szFuncName = "dm_obj_ref_query";
-	
+
 	/*
 	 * TEST    : dm_obj_ref_query - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -437,7 +437,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_obj_ref_query - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -453,7 +453,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_obj_ref_query - invalid hanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -469,7 +469,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_obj_ref_query - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -538,7 +538,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_obj_ref_query - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -554,7 +554,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 }
 
 void *Thread(void *parm)
@@ -664,7 +664,7 @@
 			case DM_EVENT_PREUNMOUNT:
 				response = DM_RESP_CONTINUE;
 				break;
-				
+			
 			default:
 			{
 				DMLOG_PRINT(DMLVL_ERR, "Message is unexpected!\n");
@@ -681,4 +681,4 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/pmr_post.c b/testcases/kernel/fs/dmapi/pmr_post.c
index d1e2e30..9aea40c 100644
--- a/testcases/kernel/fs/dmapi/pmr_post.c
+++ b/testcases/kernel/fs/dmapi/pmr_post.c
@@ -52,7 +52,7 @@
 void *Thread(void *);
 
 void LogRegions(dm_region_t *rgns, u_int nelem)
-{	
+{
 	int i;
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Regions:\n");
@@ -76,7 +76,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -111,7 +111,7 @@
 				if (write(fd, DUMMY_STRING, DUMMY_STRLEN) != DUMMY_STRLEN) {
 					rc = -1;
 					break;
-				}					
+				}				
 			}
 		} else {
 			rc = -1;
@@ -148,7 +148,7 @@
 	remove(DUMMY_FILE);
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -161,7 +161,7 @@
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI persistent managed regions test\n") ;
 
 	szFuncName = "dm_get_region";
-	
+
 	/*
 	 * TEST    : dm_get_region - persistent, Part II
 	 * EXPECTED: rc = 0, nelem = 5
@@ -891,7 +891,7 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with MULTIPLE_REGIONS defined\n");
-		DMVAR_SKIP();		
+		DMVAR_SKIP();	
 #endif
 	}
 
@@ -916,12 +916,12 @@
 		regbufin[1].rg_offset = 2000;
 		regbufin[1].rg_size = 1000;
 		regbufin[1].rg_flags = DM_REGION_WRITE;
-#else		
+#else	
 		nelemin = 1;
 		regbufin[0].rg_offset = 0;
 		regbufin[0].rg_size = 1000;
 		regbufin[0].rg_flags = DM_REGION_READ;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -961,7 +961,7 @@
 	  			DMLOG_PRINT(DMLVL_ERR, "%s failed with unexpected rc = %d\n", szFuncName, rc);
 				DMVAR_FAIL();
 			}
-	
+
 			/* Variation clean up */
 			rc = close(fd);
 			rc |= remove(DummyFile);
@@ -1049,7 +1049,7 @@
 		} else if (type == DM_EVENT_UNMOUNT) {
 			/* SPECIAL CASE: need to set response and bMounted */
 			dm_namesp_event_t *nse = DM_GET_VALUE(dmMsg, ev_data, dm_namesp_event_t *);
-			
+		
 			if (nse->ne_retcode == 0) {
 				bMounted = DM_FALSE;
 			}
@@ -1059,7 +1059,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "Message is DM_EVENT_USER\n");
 
 			DoTest();
-			
+		
 			response = DM_RESP_CONTINUE;
 		} else {
 			DMLOG_PRINT(DMLVL_ERR, "Message is unexpected!\n");
@@ -1073,4 +1073,4 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/pmr_pre.c b/testcases/kernel/fs/dmapi/pmr_pre.c
index 5a77910..08e78b6 100644
--- a/testcases/kernel/fs/dmapi/pmr_pre.c
+++ b/testcases/kernel/fs/dmapi/pmr_pre.c
@@ -70,7 +70,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -92,7 +92,7 @@
 		DM_EXIT();
 	} else {
 		int fd;
-		
+	
 		sprintf(DummyFile, "%s/%s", mountPt, DUMMY_FILE);
 		sprintf(DummySubdir, "%s/%s", mountPt, DUMMY_SUBDIR);
 
@@ -106,7 +106,7 @@
 				if (write(fd, DUMMY_STRING, DUMMY_STRLEN) != DUMMY_STRLEN) {
 					rc = -1;
 					break;
-				}					
+				}				
 			}
 		} else {
 			rc = -1;
@@ -124,7 +124,7 @@
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI persistent managed regions test initialization\n") ;
 
 	szFuncName = "dm_set_region";
-	
+
 	/*
 	 * TEST    : dm_set_region - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -751,7 +751,7 @@
 		}
 #else
 		DMLOG_PRINT(DMLVL_WARN, "Test case not built with MULTIPLE_REGIONS defined\n");
-		DMVAR_SKIP();		
+		DMVAR_SKIP();	
 #endif
 	}
 
@@ -782,7 +782,7 @@
 		regbuf[0].rg_offset = 0;
 		regbuf[0].rg_size = 1000;
 		regbuf[0].rg_flags = DM_REGION_READ;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -858,7 +858,7 @@
 		regbuf[0].rg_offset = 0;
 		regbuf[0].rg_size = 1000;
 		regbuf[0].rg_flags = DM_REGION_WRITE;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -886,7 +886,7 @@
 			regbuf[0].rg_offset = 0;
 			regbuf[0].rg_size = 1000;
 			regbuf[0].rg_flags = DM_REGION_READ;
-			
+		
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(replace)\n", szFuncName);
 			rc = dm_set_region(sid, hanp, hlen, DM_NO_TOKEN, nelem, regbuf, &exactflag);
 			if (rc == 0) {
@@ -895,7 +895,7 @@
 				if ((rc = getxattr(DummyFile, PMR_AttrName, value, sizeof(value))) < xattrlen) {
 #else
 				if ((rc = getxattr(DummyFile, PMR_AttrName, value, sizeof(value))) == xattrlen) {
-#endif					
+#endif				
 					DMLOG_PRINT(DMLVL_DEBUG, "%s passed with expected rc = 0\n", szFuncName);
 					DMVAR_PASS();
 				} else {
@@ -944,7 +944,7 @@
 		regbuf[0].rg_offset = 0;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_READ;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1001,12 +1001,12 @@
 		regbuf[1].rg_offset = PAGE_SIZE;
 		regbuf[1].rg_size = PAGE_SIZE/2;
 		regbuf[1].rg_flags = DM_REGION_WRITE;
-#else		
+#else	
 		nelem = 1;
 		regbuf[0].rg_offset = PAGE_SIZE;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_WRITE;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1068,7 +1068,7 @@
 		regbuf[0].rg_offset = PAGE_SIZE;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_WRITE;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1130,7 +1130,7 @@
 		regbuf[0].rg_offset = 0;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_READ;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1192,7 +1192,7 @@
 		regbuf[0].rg_offset = 0;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_READ;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1254,7 +1254,7 @@
 		regbuf[0].rg_offset = PAGE_SIZE;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_WRITE;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1316,7 +1316,7 @@
 		regbuf[0].rg_offset = PAGE_SIZE;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_WRITE;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1378,7 +1378,7 @@
 		regbuf[0].rg_offset = 0;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_READ;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1440,7 +1440,7 @@
 		regbuf[0].rg_offset = PAGE_SIZE;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_WRITE;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1502,7 +1502,7 @@
 		regbuf[0].rg_offset = 0;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_READ;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1564,7 +1564,7 @@
 		regbuf[0].rg_offset = 0;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_READ;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1626,7 +1626,7 @@
 		regbuf[0].rg_offset = 0;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_READ;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1688,7 +1688,7 @@
 		regbuf[0].rg_offset = PAGE_SIZE;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_WRITE;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1750,7 +1750,7 @@
 		regbuf[0].rg_offset = 0;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_READ;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1812,7 +1812,7 @@
 		regbuf[0].rg_offset = 0;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_READ;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1874,7 +1874,7 @@
 		regbuf[0].rg_offset = 0;
 		regbuf[0].rg_size = PAGE_SIZE/2;
 		regbuf[0].rg_flags = DM_REGION_READ;
-#endif		
+#endif	
 
 		sprintf(command, "cp %s %s", DUMMY_FILE, DummyFile);
 		if ((rc = system(command)) == -1) {
@@ -1946,11 +1946,11 @@
 				if ((rc = getxattr(DummyFile, PMR_AttrName, value, sizeof(value))) >= (PMR_NUM_REGIONS * sizeof(dm_region_t))) {
 					DMLOG_PRINT(DMLVL_DEBUG, "%s passed with expected rc = 0\n", szFuncName);
 					DMVAR_PASS();
-					
+				
 					printf("********************************************************\n");
 					printf("* PLEASE REBOOT AND RUN pmr_post TO COMPLETE VARIATION *\n");
 					printf("********************************************************\n");
-		
+	
 				} else {
 					DMLOG_PRINT(DMLVL_ERR, "%s failed with expected rc = %d but unexpected getxattr(%s) rc (%d vs %d), errno %d\n", szFuncName, 0, PMR_AttrName, rc, PMR_NUM_REGIONS * sizeof(dm_region_t), errno);
 					DMVAR_FAIL();
@@ -1986,7 +1986,7 @@
 	remove(DUMMY_FILE);
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -2083,4 +2083,4 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/right.c b/testcases/kernel/fs/dmapi/right.c
index b375de0..1a1f346 100644
--- a/testcases/kernel/fs/dmapi/right.c
+++ b/testcases/kernel/fs/dmapi/right.c
@@ -63,7 +63,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -132,7 +132,7 @@
 	}
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -143,9 +143,9 @@
 	int   rc;
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI rights tests\n") ;
-	
+
 	szFuncName = "dm_request_right";
-	
+
 	/*
 	 * TEST    : dm_request_right - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -161,7 +161,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - invalid hanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -177,7 +177,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -193,7 +193,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -209,7 +209,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - invalid right
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -228,7 +228,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - DM_NO_TOKEN
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -244,7 +244,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - DM_RIGHT_SHARED from DM_RIGHT_NULL
 	 * EXPECTED: rc = 0
@@ -264,7 +264,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "Unable to clean up variation! (errno = %d)\n", errno);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - DM_RIGHT_EXCL from DM_RIGHT_NULL
 	 * EXPECTED: rc = 0
@@ -284,7 +284,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "Unable to clean up variation! (errno = %d)\n", errno);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - DM_RIGHT_SHARED from DM_RIGHT_SHARED
 	 * EXPECTED: rc = 0
@@ -301,7 +301,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_RIGHT_SHARED -> DM_RIGHT_SHARED)\n", szFuncName);
 			rc = dm_request_right(sid, hanp, hlen, token, 0, DM_RIGHT_SHARED);
 			DMVAR_ENDPASSEXP(szFuncName, 0, rc);
-	
+
 			/* Variation clean up */
 			rc = dm_release_right(sid, hanp, hlen, token);
 			if (rc == -1) {
@@ -309,7 +309,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - DM_RIGHT_EXCL from DM_RIGHT_SHARED,
 	 * 		DM_RR_WAIT clear
@@ -327,7 +327,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_RIGHT_SHARED -> DM_RIGHT_EXCL, DM_RR_WAIT clear)\n", szFuncName);
 			rc = dm_request_right(sid, hanp, hlen, token, 0, DM_RIGHT_EXCL);
 			DMVAR_ENDPASSEXP(szFuncName, 0, rc);
-	
+
 			/* Variation clean up */
 			rc = dm_release_right(sid, hanp, hlen, token);
 			if (rc == -1) {
@@ -335,7 +335,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - DM_RIGHT_EXCL from DM_RIGHT_SHARED,
 	 * 		DM_RR_WAIT set
@@ -356,7 +356,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_RIGHT_SHARED -> DM_RIGHT_EXCL, DM_RR_WAIT set)\n", szFuncName);
 			rc = dm_request_right(sid, hanp, hlen, token, DM_RR_WAIT, DM_RIGHT_EXCL);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EACCES);
-	
+
 			/* Variation clean up */
 			rc = dm_release_right(sid, hanp, hlen, token);
 			if (rc == -1) {
@@ -364,7 +364,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - DM_RIGHT_EXCL from DM_RIGHT_EXCL
 	 * EXPECTED: rc = 0
@@ -381,7 +381,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_RIGHT_EXCL -> DM_RIGHT_EXCL)\n", szFuncName);
 			rc = dm_request_right(sid, hanp, hlen, token, 0, DM_RIGHT_SHARED);
 			DMVAR_ENDPASSEXP(szFuncName, 0, rc);
-	
+
 			/* Variation clean up */
 			rc = dm_release_right(sid, hanp, hlen, token);
 			if (rc == -1) {
@@ -389,7 +389,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - DM_RIGHT_SHARED from DM_RIGHT_EXCL
 	 * EXPECTED: rc = 0
@@ -406,7 +406,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_RIGHT_EXCL -> DM_RIGHT_SHARED)\n", szFuncName);
 			rc = dm_request_right(sid, hanp, hlen, token, 0, DM_RIGHT_SHARED);
 			DMVAR_ENDPASSEXP(szFuncName, 0, rc);
-	
+
 			/* Variation clean up */
 			rc = dm_release_right(sid, hanp, hlen, token);
 			if (rc == -1) {
@@ -414,7 +414,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - DM_NO_SESSION sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -430,7 +430,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -446,7 +446,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - file handle
 	 * EXPECTED: rc = 0
@@ -465,7 +465,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(file handle)\n", szFuncName);
 			rc = dm_request_right(sid, fhanp, fhlen, token, 0, DM_RIGHT_SHARED);
 			DMVAR_ENDPASSEXP(szFuncName, 0, rc);
-	
+
 			/* Variation clean up */
 			rc = dm_release_right(sid, fhanp, fhlen, token);
 			if (rc == -1) {
@@ -474,7 +474,7 @@
 			dm_handle_free(fhanp, fhlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_request_right - fs handle
 	 * EXPECTED: rc = 0
@@ -493,7 +493,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(fs handle)\n", szFuncName);
 			rc = dm_request_right(sid, fshanp, fshlen, token, 0, DM_RIGHT_SHARED);
 			DMVAR_ENDPASSEXP(szFuncName, 0, rc);
-	
+
 			/* Variation clean up */
 			rc = dm_release_right(sid, fshanp, fshlen, token);
 			if (rc == -1) {
@@ -502,9 +502,9 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	szFuncName = "dm_release_right";
-	
+
 	/*
 	 * TEST    : dm_release_right - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -520,7 +520,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_release_right - invalid hanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -536,7 +536,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_release_right - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -552,7 +552,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_release_right - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -568,7 +568,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_release_right - DM_NO_TOKEN
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -584,7 +584,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_release_right - DM_RIGHT_NULL
 	 * EXPECTED: rc = -1, errno = EACCES
@@ -600,7 +600,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_release_right - DM_RIGHT_SHARED
 	 * EXPECTED: rc = 0
@@ -621,7 +621,7 @@
 			/* Variation clean up */
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_release_right - DM_RIGHT_EXCL
 	 * EXPECTED: rc = 0
@@ -642,7 +642,7 @@
 			/* Variation clean up */
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_release_right - DM_NO_SESSION sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -658,7 +658,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_release_right - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -674,7 +674,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_release_right - file handle
 	 * EXPECTED: rc = 0
@@ -702,7 +702,7 @@
 			dm_handle_free(fhanp, fhlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_release_right - fs handle
 	 * EXPECTED: rc = 0
@@ -730,9 +730,9 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	szFuncName = "dm_query_right";
-	
+
 	/*
 	 * TEST    : dm_query_right - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -749,7 +749,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_query_right - invalid hanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -766,7 +766,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_query_right - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -783,7 +783,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_query_right - invalid token
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -800,7 +800,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_query_right - invalid rightp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -816,7 +816,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_query_right - DM_NO_TOKEN
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -833,7 +833,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_query_right - DM_RIGHT_SHARED
 	 * EXPECTED: rc = 0
@@ -870,7 +870,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_query_right - DM_RIGHT_EXCL
 	 * EXPECTED: rc = 0
@@ -924,7 +924,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_query_right - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -941,7 +941,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_query_right - file handle
 	 * EXPECTED: rc = 0
@@ -985,7 +985,7 @@
 			dm_handle_free(fhanp, fhlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_query_right - fs handle
 	 * EXPECTED: rc = 0
@@ -1029,7 +1029,7 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	szFuncName = "dm_upgrade_right";
 
 	/*
@@ -1056,7 +1056,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_upgrade_right - invalid hanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -1081,7 +1081,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_upgrade_right - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -1131,7 +1131,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_upgrade_right - DM_RIGHT_NULL
 	 * EXPECTED: rc = -1, errno = EPERM
@@ -1142,7 +1142,7 @@
 	if (DMVAR_EXEC(UPGRADE_RIGHT_BASE + 5)) {
 
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_RIGHT_NULL)\n", szFuncName);
 		rc = dm_upgrade_right(sid, hanp, hlen, token);
@@ -1150,7 +1150,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_upgrade_right - DM_RIGHT_SHARED
 	 * EXPECTED: rc = 0
@@ -1175,7 +1175,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_upgrade_right - DM_RIGHT_EXCL
 	 * EXPECTED: rc = 0
@@ -1200,7 +1200,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_upgrade_right - DM_NO_SESSION sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1225,7 +1225,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_upgrade_right - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -1250,7 +1250,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_upgrade_right - file handle
 	 * EXPECTED: rc = 0
@@ -1282,7 +1282,7 @@
 			dm_handle_free(fhanp, fhlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_upgrade_right - fs handle
 	 * EXPECTED: rc = 0
@@ -1314,7 +1314,7 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 	szFuncName = "dm_downgrade_right";
 
 	/*
@@ -1341,7 +1341,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_downgrade_right - invalid hanp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -1366,7 +1366,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_downgrade_right - invalid hlen
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -1416,7 +1416,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_downgrade_right - DM_RIGHT_NULL
 	 * EXPECTED: rc = -1, errno = EPERM
@@ -1427,7 +1427,7 @@
 	if (DMVAR_EXEC(DOWNGRADE_RIGHT_BASE + 5)) {
 
 		/* Variation set up */
-		
+	
 		/* Variation */
 		DMLOG_PRINT(DMLVL_DEBUG, "%s(DM_RIGHT_NULL)\n", szFuncName);
 		rc = dm_downgrade_right(sid, hanp, hlen, token);
@@ -1435,7 +1435,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_downgrade_right - DM_RIGHT_SHARED
 	 * EXPECTED: rc = -1, errno = EPERM
@@ -1460,7 +1460,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_downgrade_right - DM_RIGHT_EXCL
 	 * EXPECTED: rc = 0
@@ -1485,7 +1485,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_downgrade_right - DM_NO_SESSION sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -1510,7 +1510,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_downgrade_right - global handle
 	 * EXPECTED: rc = -1, errno = EBADF
@@ -1535,7 +1535,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_downgrade_right - file handle
 	 * EXPECTED: rc = 0
@@ -1567,7 +1567,7 @@
 			dm_handle_free(fhanp, fhlen);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_downgrade_right - fs handle
 	 * EXPECTED: rc = 0
@@ -1599,7 +1599,7 @@
 			dm_handle_free(fshanp, fshlen);
 		}
 	}
-	
+
 }
 
 void *Thread(void *parm)
@@ -1709,7 +1709,7 @@
 			case DM_EVENT_PREUNMOUNT:
 				response = DM_RESP_CONTINUE;
 				break;
-				
+			
 			default:
 			{
 				DMLOG_PRINT(DMLVL_ERR, "Message is unexpected!\n");
@@ -1726,4 +1726,4 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
diff --git a/testcases/kernel/fs/dmapi/session.c b/testcases/kernel/fs/dmapi/session.c
index c45e034..de5928d 100644
--- a/testcases/kernel/fs/dmapi/session.c
+++ b/testcases/kernel/fs/dmapi/session.c
@@ -37,7 +37,7 @@
 char dmMsgBuf[4096];
 
 void LogSessions(dm_sessid_t *sid, u_int nelem)
-{	
+{
 	int i;
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Sessions:\n");
@@ -54,10 +54,10 @@
 	char *varstr;
 	int   i;
 	int   rc;
-	
+
 	DMOPT_PARSE(argc, argv);
 	DMLOG_START();
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -96,7 +96,7 @@
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI session tests\n") ;
-	
+
 	szFuncName = "dm_create_session";
 
 	/*
@@ -115,7 +115,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_create_session - NULL sessinfop
 	 * EXPECTED: rc = 0
@@ -132,7 +132,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_create_session - invalid sessinfop
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -168,7 +168,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_create_session - invalid newsidp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -207,7 +207,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "Unable to clean up variation! (errno = %d)\n", errno);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_create_session - valid oldsid
 	 * EXPECTED: rc = 0
@@ -238,7 +238,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_create_session - invalidated oldsid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -257,7 +257,7 @@
 			DMVAR_SKIP();
 		} else {
 			delsid = newsid;
-			
+		
 			/* Variation */
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalidated oldsid)\n", szFuncName);
 			rc = dm_create_session(oldsid, szSessionInfo, &newsid);
@@ -270,7 +270,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_create_session - maximum sessinfo
 	 * EXPECTED: rc = 0
@@ -355,7 +355,7 @@
 			}
 		}
 	}
-	
+
 	szFuncName = "dm_destroy_session";
 
 	/*
@@ -407,11 +407,11 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalidated sid)\n", szFuncName);
 			rc = dm_destroy_session(newsid);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 			/* Variation clean up */
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_destroy_session - valid sid
 	 * EXPECTED: rc = 0
@@ -429,11 +429,11 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(valid sid)\n", szFuncName);
 			rc = dm_destroy_session(newsid);
 			DMVAR_ENDPASSEXP(szFuncName, 0, rc);
-	
+
 			/* Variation clean up */
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_destroy_session - sid with oustanding events
 	 * EXPECTED: rc = -1, erno = EBUSY
@@ -455,7 +455,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(valid sid)\n", szFuncName);
 			rc = dm_destroy_session(newsid);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EBUSY);
-	
+
 			/* Variation clean up */
 			rc = dm_get_events(newsid, 1, 0, sizeof(dmMsgBuf), dmMsgBuf, &rlen);
 			rc |= dm_destroy_session(newsid);
@@ -464,9 +464,9 @@
 			}
 		}
 	}
-	
+
 	szFuncName = "dm_getall_sessions";
-	
+
 	/*
 	 * TEST    : dm_getall_sessions - NULL sidbufp
 	 * EXPECTED: rc = -1, errno EFAULT
@@ -599,7 +599,7 @@
 			DMLOG_PRINT(DMLVL_ERR, "%s failed with unexpected rc = %d (errno = %d)\n", szFuncName, rc, errno);
 			DMVAR_FAIL();
 		}
-		
+	
 		/* Variation clean up */
 	}
 
@@ -667,7 +667,7 @@
 			rc = dm_getall_sessions(1, sidArray, &nelem);
 			if (rc == 0) {
 				DMLOG_PRINT(DMLVL_DEBUG, "nelem = %d\n", nelem);
-				
+			
 				if (nelem == 1) { 
 					LogSessions(sidArray, nelem);
 
@@ -766,7 +766,7 @@
 			rc = dm_getall_sessions(sizeof(sidArray)/sizeof(dm_sessid_t), sidArray, &nelem);
 			if (rc == 0) {
 				DMLOG_PRINT(DMLVL_DEBUG, "nelem = %d\n", nelem);
-				
+			
 				if (nelem == NUM_SESSIONS) {
 					LogSessions(sidArray, nelem);
 
@@ -815,7 +815,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_query_session - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -833,7 +833,7 @@
 
 		/* Variation clean up */
 	}
-	
+
 	/*
 	 * TEST    : dm_query_session - invalidated sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -855,7 +855,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalidated sid)\n", szFuncName);
 			rc = dm_query_session(newsid, sizeof(buf), buf, &rlen);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EINVAL);
-	
+
 			/* Variation clean up */
 		}
 	}
@@ -991,7 +991,7 @@
 			if (rc == -1) {
 				if (errno == E2BIG) {
 					DMLOG_PRINT(DMLVL_DEBUG, "rlen = %d\n", rlen);
-					
+				
 					if (rlen == strlen(szSessionInfo)+1) {
 						DMLOG_PRINT(DMLVL_DEBUG, "%s passed with expected rc = %d and expected errno = %d\n", szFuncName, -1, E2BIG);
 						DMVAR_PASS();
@@ -1007,7 +1007,7 @@
 	  			DMLOG_PRINT(DMLVL_ERR, "%s failed with unexpected rc = %d\n", szFuncName, rc);
 				DMVAR_FAIL();
 			}
-	
+
 			/* Variation clean up */
 			rc = dm_destroy_session(newsid);
 			if (rc == -1) {
@@ -1055,7 +1055,7 @@
 				DMLOG_PRINT(DMLVL_ERR, "%s failed with unexpected rc = %d (errno = %d)\n", szFuncName, rc, errno);
 				DMVAR_FAIL();
 			}
-	
+
 			/* Variation clean up */
 			rc = dm_destroy_session(newsid);
 			if (rc == -1) {
@@ -1086,7 +1086,7 @@
 			rc = dm_query_session(newsid, sizeof(buf), buf, &rlen);
 			if (rc == 0) {
 				DMLOG_PRINT(DMLVL_DEBUG, "rlen = %d\n", rlen);
-				
+			
 				if (rlen == DM_SESSION_INFO_LEN) {
 					DMLOG_PRINT(DMLVL_DEBUG, "buf = \"%s\"\n", buf);
 
@@ -1113,9 +1113,9 @@
 			}
 		}
 	}
-	
+
 	DMLOG_STOP();
-			
+		
 	return 0;
 
 }
diff --git a/testcases/kernel/fs/dmapi/token.c b/testcases/kernel/fs/dmapi/token.c
index 139c1d2..60c2419 100644
--- a/testcases/kernel/fs/dmapi/token.c
+++ b/testcases/kernel/fs/dmapi/token.c
@@ -62,7 +62,7 @@
 
 	DMEV_ZERO(events);
 	DMEV_SET(DM_EVENT_MOUNT, events);
-	
+
 	/* CANNOT DO ANYTHING WITHOUT SUCCESSFUL INITIALIZATION!!! */
 	if ((rc = dm_init_service(&varstr)) != 0) {
 		DMLOG_PRINT(DMLVL_ERR, "dm_init_service failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -89,9 +89,9 @@
 	}
 
 	DMLOG_PRINT(DMLVL_DEBUG, "Starting DMAPI tokens tests\n") ;
-	
+
 	szFuncName = "dm_getall_tokens";
-	
+
 	/*
 	 * TEST    : dm_getall_tokens - invalid sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -121,7 +121,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_getall_tokens - invalid nelem
 	 * EXPECTED: rc = -1, errno = E2BIG
@@ -168,7 +168,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_getall_tokens - invalid tokenbufp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -189,7 +189,7 @@
 			DMLOG_PRINT(DMLVL_DEBUG, "%s(invalid tokenbufp)\n", szFuncName);
 			rc = dm_getall_tokens(sid, TOKBUF_NUM, (dm_token_t *)INVALID_ADDR, &nelem);
 			DMVAR_ENDFAILEXP(szFuncName, -1, rc, EFAULT);
-	
+
 			/* Variation clean up */
 			rc = dm_respond_event(sid, token, DM_RESP_CONTINUE, 0, 0, NULL);
 			if (rc == -1) {
@@ -197,7 +197,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_getall_tokens - invalid nelemp
 	 * EXPECTED: rc = -1, errno = EFAULT
@@ -226,7 +226,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_getall_tokens - one userevent token
 	 * EXPECTED: rc = 0
@@ -274,7 +274,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_getall_tokens - two userevent tokens
 	 * EXPECTED: rc = 0
@@ -333,7 +333,7 @@
 			}
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_getall_tokens - one event token
 	 * EXPECTED: rc = 0
@@ -381,7 +381,7 @@
 			pthread_join(tidToken, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_getall_tokens - one event token, one userevent token
 	 * EXPECTED: rc = 0
@@ -446,7 +446,7 @@
 			pthread_join(tidToken, NULL);
 		}
 	}
-	
+
 	/*
 	 * TEST    : dm_getall_tokens - DM_NO_SESSION sid
 	 * EXPECTED: rc = -1, errno = EINVAL
@@ -476,7 +476,7 @@
 			}
 		}
 	}
-	
+
 	rc = umount(mountPt);
 	if (rc == -1) {
 		DMLOG_PRINT(DMLVL_ERR, "umount failed! (rc = %d, errno = %d)\n", rc, errno);
@@ -490,7 +490,7 @@
 	}
 
 	DMLOG_STOP();
-			
+		
 	return 0;
 }
 
@@ -591,7 +591,7 @@
 			case DM_EVENT_PREUNMOUNT:
 				response = DM_RESP_CONTINUE;
 				break;
-				
+			
 			case DM_EVENT_CREATE:
 			{
 				dm_namesp_event_t *nse = DM_GET_VALUE(dmMsg, ev_data, dm_namesp_event_t *);
@@ -604,10 +604,10 @@
 
 				createToken = token;
 				DMLOG_PRINT(DMLVL_DEBUG, "  Token: %d\n", createToken);
-				
+			
 				/* Wait for main thread to call dm_getall_tokens */
 				sleep(3);
-				
+			
 				response = DM_RESP_CONTINUE;
 				break;
 			}
@@ -628,7 +628,7 @@
 	} while (bMounted);
 
 	pthread_exit(0);
-}	
+}
 
 void *TokenThread(void *parm)
 {
diff --git a/testcases/kernel/fs/doio/doio.c b/testcases/kernel/fs/doio/doio.c
index b95f128..bfd7cf7 100644
--- a/testcases/kernel/fs/doio/doio.c
+++ b/testcases/kernel/fs/doio/doio.c
@@ -404,7 +404,7 @@
 
 	random_range_seed(getpid());       /* initialize random number generator */
 
-	/*	
+	/*
 	 * If this is a re-exec of doio, jump directly into the doio function.
 	 */
 
@@ -503,10 +503,10 @@
 					     i+1, SYSERR, errno);
 				exit(E_SETUP);
 			}
-			
+		
 			Children[Nchildren] = pid;
 			Nchildren++;
-			
+		
 			if (pid == 0) {
 				if (e_opt) {
 					char *exec_path;
@@ -530,21 +530,21 @@
 		/*
 		 * Parent spins on wait(), until all children exit.
 		 */
-		
+	
 		ex_stat = E_NORMAL;
-		
+	
 		while (Nprocs) {
 			if ((pid = wait(&stat)) == -1) {
 				if (errno == EINTR)
 					continue;
 			}
-			
+		
 			for (i = 0; i < Nchildren; i++)
 				if (Children[i] == pid)
 					Children[i] = -1;
-			
+		
 			Nprocs--;
-			
+		
 			if (WIFEXITED(stat)) {
 				switch (WEXITSTATUS(stat)) {
 				case E_NORMAL:
@@ -596,10 +596,10 @@
 				doio_fprintf(stderr,
 					     "(parent) pid %d terminated by signal %d\n",
 					     pid, WTERMSIG(stat));
-				
+			
 				ex_stat |= E_SIGNAL;
 			}
-			
+		
 			fflush(NULL);
 		}
 	}
@@ -653,7 +653,7 @@
 	if (w_opt) {
 
 		strcpy(Wlog.w_file, Write_Log);
-	
+
 		if (wlog_open(&Wlog, 0, 0666) == -1) {
 			doio_fprintf(stderr,
 				     "Could not open write log file (%s): wlog_open() failed\n",
@@ -1032,7 +1032,7 @@
 	{ "FDATASYNC",	FDATASYNC	},
 
 	{ "unknown",	-1		},
-};	
+};
 
 struct smap aionames[] = {
 	{ "poll",	A_POLL		},
@@ -1867,7 +1867,7 @@
 		case LO_WRITE:	opcode = "LO_WRITE";	break;
 		default:	opcode = "???";		break;
 		}
-			
+		
 		cp += sprintf(cp, "          li_opcode =    %s\n", opcode);
 		cp += sprintf(cp, "          li_drvr =      %#o\n", listreq->li_drvr);
 		cp += sprintf(cp, "          li_flags =     %#o\n", listreq->li_flags);
@@ -2332,7 +2332,7 @@
 #endif
 #ifdef sgi
 	if(io->r_oflags & O_DIRECT) {
-		
+	
 		if(fcntl(fd, F_DIOINFO, &finfo) == -1) {
 			cp += sprintf(cp, "          Error %s (%d) getting direct I/O info\n",
 				      strerror(errno), errno);
@@ -3940,7 +3940,7 @@
 			}
 		}
 		break;
-		
+	
 	case MEM_SHMEM:
 		if( nbytes > M->size ) {
 			if( M->space != NULL ) {
@@ -4169,7 +4169,7 @@
 #ifdef sgi
 	struct dioattr		finfo;
 #endif
-	
+
 	/*
 	 * If file is NULL, it means to free up the fd cache.
 	 */
@@ -4420,7 +4420,7 @@
 	   stronger.)
 	 */
 
-	
+
 	if( active_mmap_rw && havesigint && (info->si_errno == EINTR) ){
 		cleanup_handler( sig, info, v );
 	}
@@ -4892,13 +4892,13 @@
 		argv[0]++;
 		Execd = 1;
 	}
-	
+
 	if ((Prog = strrchr(argv[0], '/')) == NULL) {
 		Prog = argv[0];
 	} else {
 		Prog++;
 	}
-	
+
 	opterr = 0;
 	while ((c = getopt(argc, argv, opts)) != EOF) {
 		switch ((char)c) {
@@ -5079,11 +5079,11 @@
 			break;
 		}
 	}
-	
+
 	/*
 	 * Supply defaults
 	 */
-	
+
 	if (! C_opt) {
 		Data_Fill = doio_pat_fill;
 		Data_Check = doio_pat_check;
@@ -5094,7 +5094,7 @@
 
 	if (! n_opt)
 		Nprocs = 1;
-	
+
 	if (! r_opt)
 		Release_Interval = DEF_RELEASE_INTERVAL;
 
@@ -5122,7 +5122,7 @@
 	}
 
 	return 0;
-}	
+}
 
 
 
@@ -5455,5 +5455,5 @@
 	fprintf(stream, "\t                     of io_req structures (see doio.h).  Currently\n");
 	fprintf(stream, "\t                     only the iogen program generates the proper\n");
 	fprintf(stream, "\t                     format\n");
-}	
+}
 
diff --git a/testcases/kernel/fs/doio/growfiles.c b/testcases/kernel/fs/doio/growfiles.c
index 1967fa9..54ccc79 100644
--- a/testcases/kernel/fs/doio/growfiles.c
+++ b/testcases/kernel/fs/doio/growfiles.c
@@ -184,7 +184,7 @@
  *	________________________________________________________________
  *	<    pid       >< offset in file of this word  ><    pid       >
  */
-	
+
 #define PATTERN_OFFSET	3	/* Like PATTERN_PID but has a fixed number */
 				/* (STATIC_NUM) instead of pid. */
 				/* Allows multiple processes to write/read */
@@ -786,7 +786,7 @@
 			break;
 
 		case 's':	/* format: seed[,seed...] */
-			
+		
 			/* count the number of seeds */
 			cptr=optarg;
 			for(Nseeds=1; *cptr ; Nseeds++) {
@@ -1009,7 +1009,7 @@
 	    else if ( Pattern == PATTERN_ZEROS )
 		printf("%s: %d DEBUG3 all zeros pattern - allows multiple writers\n",
 		    Progname, Pid);
-	
+
 	    else
 		printf("%s: %d DEBUG3 unknown pattern\n",
 		    Progname, Pid);
@@ -1133,7 +1133,7 @@
 		gettimeofday(&ts,NULL);
 	    Seed=ts.tv_sec + Pid;  /* default random seed */
 	    //Seed=time(0) + Pid;  /* default random seed */
-		
+	
 	}
 
 	random_range_seed(Seed);
@@ -1225,7 +1225,7 @@
 	/*
 	 * construct auto filename and insert them into filenames space
 	 */
-		
+	
 	for(ind=0;ind<num_auto_files; ind++, num++) {
 		gettimeofday(&tv1,NULL);
 		sprintf((char *)filenames+(num*PATH_MAX), "%s/%s%ld%ld%d.%d",
@@ -1243,7 +1243,7 @@
 /**** end filename stuff ****/
 
 	if ( time_iterval > 0 )
-	{	
+	{
 		struct timeval ts;
 		gettimeofday(&ts,NULL);
 		start_time=ts.tv_sec;
@@ -1465,7 +1465,7 @@
 		 * Unlink the file if that is desired
 		 */
 		if ( unlink_inter && (Iter_cnt % unlink_inter == 0) ) {
-		
+	
 		    if ( Debug > 4 )
 			printf("%s: %d DEBUG5 %s/%d: %d Unlinking file %s\n",
 			    Progname, Pid, __FILE__, __LINE__, Iter_cnt, filename);
@@ -1477,7 +1477,7 @@
 	         * delay while staying active for "delaysecs" seconds.
 	         */
 	        if ( delaytime ) {
-		
+	
 		    int ct, end;
 #ifdef CRAY
 		    ct=_rtc();
@@ -1546,7 +1546,7 @@
 {
    int sig;
 
-	
+
         /*
          * now loop through all signals and set the handlers
          */
@@ -1823,7 +1823,7 @@
     fprintf(stream,
 	 "# writes 4096 to files until 50 blocks are written\n\
 %s -i 0 -g 4096 -B 50b file1 file2\n\n", Progname);
-	
+
     fprintf(stream,
 	 "# write one byte to 750 files in gdir then unlinks them\n\
 %s -g 1 -C 0 -d gdir -u -S 750\n\n", Progname);
@@ -1944,7 +1944,7 @@
 		}
 
 		lkfile(fd, LOCK_EX, LKLVL0);	 /* get exclusive lock */
-		
+	
 #if NEWIO
 		ret=lio_write_buffer(fd, io_type, "w", 1, SIGUSR1, &errmsg,0);
 #else
@@ -1991,7 +1991,7 @@
         	    } else {
             		fprintf(stderr, "%s%s: %d %s/%d: Unable to fstat(%d, &buf), errno:%d %s\n",
                 	Progname, TagName, Pid, __FILE__, __LINE__, fd, errno, strerror(errno));
-	
+
 			lkfile(fd, LOCK_UN, LKLVL0);     /* release lock */
             		return -1;
         	    }
@@ -2003,12 +2003,12 @@
 		} else if ( Mode & MODE_RAND_LSEEK ) {
                    if ( max_lseek == LSK_EOF ) {	/* within file size */
                         noffset=random_range(min_lseek, fsize, 1, NULL);
-                   }		
-		   else if ( max_lseek == LSK_EOFPLUSGROW ) {	
+                   }	
+		   else if ( max_lseek == LSK_EOFPLUSGROW ) {
 		        /* max to beyond file size */
 			noffset=random_range(min_lseek, fsize+grow_incr, 1, NULL);
 		   }
-		   else if ( max_lseek == LSK_EOFMINUSGROW ) {	
+		   else if ( max_lseek == LSK_EOFMINUSGROW ) {
 		        /*
 			 * Attempt to not grow the file.
 			 * If the i/o will fit from min_lseek to EOF,
@@ -2086,7 +2086,7 @@
 
 		tmp=tell(fd);
 
-		lkfile(fd, LOCK_UN, LKLVL0);	
+		lkfile(fd, LOCK_UN, LKLVL0);
 
 		if ( ret != grow_incr) {
 			fprintf(stderr, "%s: %s/%d: write failed: %s\n",
@@ -2136,7 +2136,7 @@
 		}
 		*curr_size_ptr=tmp;	/* BUG:14136 */
 
-		lkfile(fd, LOCK_UN, LKLVL0);	
+		lkfile(fd, LOCK_UN, LKLVL0);
 
 		if ( ret != grow_incr ) {
 			fprintf(stderr, "%s%s: %d %s/%d: %d %s\n",
@@ -2163,7 +2163,7 @@
 		     * The pattern written to the file will be considered corrupted.
 		     */
 		    if ( Debug > 0 && lockfile ) {
-		        printf("%s%s: %d DEBUG1 %s/%d: offset after write(%ld) not as exp(%ld+%d=%ld)\n", 	
+		        printf("%s%s: %d DEBUG1 %s/%d: offset after write(%ld) not as exp(%ld+%d=%ld)\n", 
 			    Progname, TagName, Pid, __FILE__, __LINE__, tmp, Woffset, grow_incr, Woffset+grow_incr);
 			printf("%s%s: %d DEBUG1 %s/%d: %d Assuming file changed by another process, resetting offset:%ld (expect pattern mismatch)\n",
 				Progname, TagName, Pid, __FILE__, __LINE__, Iter_cnt, tmp-grow_incr);
@@ -2260,7 +2260,7 @@
 	            lkfile(fd, LOCK_UN, LKLVL0);
 		    return -1;
 		}
-			
+		
 		if ( new_offset < min_lseek )
 		    new_offset=min_lseek;
 		else
@@ -2290,7 +2290,7 @@
 
 	    if ( new_offset < 0 )
 		new_offset=0;
-	
+
 #ifdef CRAY
 	    if (  lseek(fd, new_offset, SEEK_SET) == -1 ) {
 		fprintf(stderr, "%s%s: %d %s/%d: lseek(fd, %d, SEEK_SET) l4 failed: %s\n",
@@ -2332,7 +2332,7 @@
 	    printf("%s: %d DEBUG2 %s/%d: trunc file by %d bytes, to size of = %d bytes\n",
 		Progname, Pid, __FILE__, __LINE__, cur_offset-new_offset, new_offset);
 	}
-	
+
 
         bytes_consumed -= (cur_offset - new_offset);
 	return 0;
@@ -2374,7 +2374,7 @@
 
 
    
-    /*	
+    /*
      * Get the shared file lock.  We need to hold the lock from before
      * we do the stat until after the read.
      */
@@ -2485,7 +2485,7 @@
 	    return 1;
 	}
 	return 0;   /* all is well */
-	
+
     }
     else if ( Pattern == PATTERN_OFFSET )
 	ret=datapidchk(STATIC_NUM, Buffer, Grow_incr, Woffset, &errmsg);
@@ -2574,7 +2574,7 @@
 	 * a trunc/truncate from "corrupting" our data.
 	 */
 	lkfile(fd, LOCK_SH, LKLVL0);
-	
+
 	if ((fsize=file_size(fd)) == -1 )  {
 	    lkfile(fd, LOCK_UN, LKLVL0);
 	    return -1;
@@ -2615,7 +2615,7 @@
 		    rd_size=MAX_FC_READ;
 	        else
 		    rd_size=fsize - rd_cnt;
-				
+			
 #if NEWIO
 	        ret=lio_read_buffer(fd, io_type, buf, rd_size,
 		    SIGUSR1, &errmsg,0);
@@ -2654,7 +2654,7 @@
 	            ret=databinchk('o', buf, rd_size, rd_cnt, &errmsg);
 	        else
 	            ret=dataasciichk(NULL, buf, rd_size, rd_cnt, &errmsg);
-		
+	
 		   
 	        if ( ret >= 0 ) {
 		    fprintf(stderr,
@@ -2752,7 +2752,7 @@
             fprintf(stderr, "%s%s: %d %s/%d: Unable to fstat(%d, &buf), errno:%d %s\n",
                 Progname, TagName, Pid, __FILE__, __LINE__, fd, errno, strerror(errno));
 	    return -1;
-	
+
         }
 
         return sb.st_size;
@@ -2768,7 +2768,7 @@
 
    
     if ( lockfile == lklevel) {
-	
+
         if ( Debug > 5 ) {
 	    switch (operation) {
  	    case LOCK_UN:
@@ -2818,7 +2818,7 @@
 	        printf("%s: %d DEBUG3 %s/%d: Got write/exclusive lock on fd %d\n",
 		    Progname, Pid, __FILE__, __LINE__, fd);
 		break;
-	
+
 	    default:
 	        printf("%s: %d DEBUG3 %s/%d: Completed action %d on fd %d\n",
 		    Progname, Pid, __FILE__, __LINE__, operation, fd);
diff --git a/testcases/kernel/fs/doio/iogen.c b/testcases/kernel/fs/doio/iogen.c
index 16fba95..8e4d282 100644
--- a/testcases/kernel/fs/doio/iogen.c
+++ b/testcases/kernel/fs/doio/iogen.c
@@ -1732,10 +1732,10 @@
 	 * Initialize File_List[] - only necessary if doing file io.  First
 	 * space for the File_List array, then fill it in.
 	 */
-	
+
 	File_List = (struct file_info *)
 	    malloc((argc-optind) * sizeof(struct file_info));
-	
+
 	if (File_List == NULL) {
 	    fprintf(stderr, "iogen%s:  Could not malloc space for %d file_info structures\n", TagName, argc-optind);
 	    exit(2);
@@ -1845,12 +1845,12 @@
 			fptr->f_lastoffset = 0;
 			fptr->f_lastlength = 0;
 			break;
-			
+		
 		    case M_REVERSE:
 			fptr->f_lastoffset = fptr->f_length;
 			fptr->f_lastlength = 0;
 			break;
-			
+		
 		    case M_RANDOM:
 			fptr->f_lastoffset = fptr->f_length / 2;
 			fptr->f_lastlength = 0;
diff --git a/testcases/kernel/fs/fs_di/create_datafile.c b/testcases/kernel/fs/fs_di/create_datafile.c
index 3243fec..bc7f281 100644
--- a/testcases/kernel/fs/fs_di/create_datafile.c
+++ b/testcases/kernel/fs/fs_di/create_datafile.c
@@ -22,7 +22,7 @@
  *  PURPOSE	: Creates a file of specified size.
  *  HISTORY	:
  *  	10/17/2003 Robbie Williamson
- *	  -Written  	
+ *	  -Written  
  */
 
 #include <stdio.h>
diff --git a/testcases/kernel/fs/fsstress/fsstress.c b/testcases/kernel/fs/fsstress/fsstress.c
index 978d922..1f11f6e 100644
--- a/testcases/kernel/fs/fsstress/fsstress.c
+++ b/testcases/kernel/fs/fsstress/fsstress.c
@@ -47,9 +47,9 @@
 	OP_DREAD,
 	OP_DWRITE,
 	OP_FDATASYNC,
-#ifndef NO_XFS	
+#ifndef NO_XFS
 	OP_FREESP,
-#endif	
+#endif
 	OP_FSYNC,
 	OP_GETDENTS,
 	OP_LINK,
@@ -58,18 +58,18 @@
 	OP_READ,
 	OP_READLINK,
 	OP_RENAME,
-#ifndef NO_XFS	
+#ifndef NO_XFS
 	OP_RESVSP,
-#endif	
+#endif
 	OP_RMDIR,
 	OP_STAT,
 	OP_SYMLINK,
 	OP_SYNC,
 	OP_TRUNCATE,
 	OP_UNLINK,
-#ifndef NO_XFS	
+#ifndef NO_XFS
 	OP_UNRESVSP,
-#endif	
+#endif
 	OP_WRITE,
 	OP_LAST
 } opty_t;
@@ -295,9 +295,9 @@
 	ptrdiff_t	srval;
 #endif
         int             nousage=0;
-#ifndef NO_XFS		
+#ifndef NO_XFS	
 	xfs_error_injection_t	err_inj;
-#endif	
+#endif
 
 	errrange = errtag = 0;
 	umask(0);
@@ -389,7 +389,7 @@
 					ops[i].freq = 0;
 			}
 		}
-       	
+       
        	 	if (!dirname) {
        	     	/* no directory specified */
     	        	if (!nousage) usage();
@@ -415,7 +415,7 @@
 			seed = (int)t.tv_sec ^ (int)t.tv_usec;
 			printf("seed = %ld\n", seed);
 		}
-#ifndef NO_XFS	
+#ifndef NO_XFS
 		if (!no_xfs) {
 		i = ioctl(fd, XFS_IOC_FSGEOMETRY, &geom);
 		if (i >= 0 && geom.rtblocks)
@@ -455,7 +455,7 @@
 				exit(1);
 			}
 		} else
-#endif	
+#endif
 			close(fd);
 		unlink(buf);
 		if (nproc == 1) {
@@ -472,7 +472,7 @@
 			while (wait(&stat) > 0)
 				continue;
 		}
-#ifndef NO_XFS		
+#ifndef NO_XFS	
 		if (errtag != 0) {
 			err_inj.errtag = 0;
 			err_inj.fd = fd;
@@ -489,7 +489,7 @@
 	{
 	  sprintf(cmd,"rm -rf %s/*",dirname);
 	  system(cmd);
-	}	
+	}
         loopcntr++;
 	}
 	return 0;
@@ -724,7 +724,7 @@
 		p = &ops[freq_table[random() % freq_table_size]];
 		if ((unsigned long)p->func < 4096) abort();
 
-		
+	
 		p->func(opno, random());
 		/*
 		 * test for forced shutdown by stat'ing the test
@@ -1492,7 +1492,7 @@
 	if (aname == NULL) {
 		if (v)
 			printf(
-			"%d/%d: attr_remove - name %d not found at %s\n",	
+			"%d/%d: attr_remove - name %d not found at %s\n",
 				procid, opno, which, f.path);
 		free_pathname(&f);
 		return;
@@ -1690,7 +1690,7 @@
 	check_cwd();
 	esz = 0;
 	if (fd >= 0) {
-#ifndef NO_XFS	
+#ifndef NO_XFS
 		struct fsxattr	a;
 		if (extsize && ioctl(fd, XFS_IOC_FSGETXATTR, &a) >= 0) {
 			a.fsx_xflags |= XFS_XFLAG_REALTIME;
@@ -1699,9 +1699,9 @@
 			if (ioctl(fd, XFS_IOC_FSSETXATTR, &a) < 0)
 				e1 = errno;
 			esz = a.fsx_estsize;
-			
+		
 		}
-#endif		
+#endif	
 		 		 add_to_flist(type, id, parid);
 		close(fd);
 	}
@@ -1791,13 +1791,13 @@
 		close(fd);
 		return;
 	}
-	
+
 	if (no_xfs) {
 		diob.d_miniosz = stb.st_blksize;
 		diob.d_maxiosz = stb.st_blksize * 256;  /* good number ? */
 		diob.d_mem = stb.st_blksize;
 	}
-#ifndef NO_XFS	
+#ifndef NO_XFS
 	   else 	if (ioctl(fd, XFS_IOC_DIOINFO, &diob) < 0) {
 		if (v)
 			printf(
@@ -1807,7 +1807,7 @@
 		close(fd);
 		return;
 	}
-#endif	
+#endif
 	align = (__int64_t)diob.d_miniosz;
 	lr = ((__int64_t)random() << 32) + random();
 	off = (off64_t)(lr % stb.st_size);
@@ -1877,7 +1877,7 @@
 		diob.d_maxiosz = stb.st_blksize * 256;  /* good number ? */
 		diob.d_mem = stb.st_blksize;
 	}
-#ifndef NO_XFS	
+#ifndef NO_XFS
 	else if (ioctl(fd, XFS_IOC_DIOINFO, &diob) < 0) {
 		if (v)
 			printf(
@@ -1887,7 +1887,7 @@
 		close(fd);
 		return;
 	}
-#endif	
+#endif
 	align = (__int64_t)diob.d_miniosz;
 	lr = ((__int64_t)random() << 32) + random();
 	off = (off64_t)(lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
diff --git a/testcases/kernel/fs/fsx-linux/fsx-linux.c b/testcases/kernel/fs/fsx-linux/fsx-linux.c
index 98e28c5..89cb866 100644
--- a/testcases/kernel/fs/fsx-linux/fsx-linux.c
+++ b/testcases/kernel/fs/fsx-linux/fsx-linux.c
@@ -1414,4 +1414,4 @@
 	return 0;
 }
 
- 	  	
+ 	  
diff --git a/testcases/kernel/fs/ftest/ftest01.c b/testcases/kernel/fs/ftest/ftest01.c
index 454467c..8bbbdce 100644
--- a/testcases/kernel/fs/ftest/ftest01.c
+++ b/testcases/kernel/fs/ftest/ftest01.c
@@ -44,7 +44,7 @@
  * CAUTION!!
  *	If a file is supplied to this program with the "-f" option
  *	it will be removed with a system("rm -rf filename") call.
- *	
+ *
  */
 #define _GNU_SOURCE 1
 #include <stdio.h>		/* needed by testhead.h		*/
diff --git a/testcases/kernel/fs/ftest/ftest02.c b/testcases/kernel/fs/ftest/ftest02.c
index 8e5a03f..974f600 100644
--- a/testcases/kernel/fs/ftest/ftest02.c
+++ b/testcases/kernel/fs/ftest/ftest02.c
@@ -24,7 +24,7 @@
  * CALLS
  *	open, close,  read, write, lseek,
  *	unlink, chdir
- *	
+ *
  *
  * ALGORITHM
  *
@@ -129,7 +129,7 @@
 	/*
 	 * Make a directory to do this in; ignore error if already exists.
 	 */
-	
+
 
 	local_flag = PASSED;
 	parent_pid = getpid();
@@ -485,14 +485,14 @@
 	register int i;
 
 	//tst_resm(TINFO, "term -[%d]- got sig term.", getpid());
-	
+
 	if (parent_pid == getpid()) {
 		for (i=0; i < nchild; i++)
 			if (pidlist[i])		/* avoid embarassment */
 				kill(pidlist[i], SIGTERM);
 		return 0;
 	}
-	
+
 	tst_resm(TBROK, "Child process exiting.");
 	tst_exit();
 	return 0;
diff --git a/testcases/kernel/fs/ftest/ftest03.c b/testcases/kernel/fs/ftest/ftest03.c
index fe86771..35d4328 100644
--- a/testcases/kernel/fs/ftest/ftest03.c
+++ b/testcases/kernel/fs/ftest/ftest03.c
@@ -48,7 +48,7 @@
  * CAUTION!!
  *	If a file is supplied to this program with the "-f" option
  *	it will be removed with a system("rm -rf filename") call.
- *	
+ *
  */
 
 #define _XOPEN_SOURCE 500
@@ -122,7 +122,7 @@
         }
 
 	setup();
-	
+
 	for (lc = 0; TEST_LOOPING(lc); lc++) {
 
 		local_flag = PASSED;
@@ -134,7 +134,7 @@
                 } else {
                         tst_resm(TFAIL, "Test failed.");
                 }
-	
+
 		tst_rmdir();
 		tst_exit();
 	} /* end for */
@@ -170,7 +170,7 @@
 		tst_exit() ;
 	}
 
-	
+
 	/*
 	 * Default values for run conditions.
 	 */
@@ -279,7 +279,7 @@
 		tst_resm(TINFO, "CAUTION - ftest03, '%s' may not be removed",
 		  fuss);
 	}
-	
+
 	sync();				/* safeness */
 	return 0;
 }
@@ -370,7 +370,7 @@
 			tst_exit();
 		}
 		val_iovec[i].iov_len = w_ioveclen;
-		
+	
 		if(malloc((i+1)*8) == 0) {
 			tst_resm(TBROK, "\tmalloc failed");
 			tst_exit();
diff --git a/testcases/kernel/fs/ftest/ftest04.c b/testcases/kernel/fs/ftest/ftest04.c
index 092a6a8..784ddea 100644
--- a/testcases/kernel/fs/ftest/ftest04.c
+++ b/testcases/kernel/fs/ftest/ftest04.c
@@ -23,7 +23,7 @@
  *
  * CALLS
  *	fsync, sync, lseek, read, write
- *	
+ *
  *
  * ALGORITHM
  *	Several child processes doing random seeks, read/write
@@ -33,7 +33,7 @@
  * RESTRICTIONS
  *	Runs a long time with default args - can take others on input
  *	line.  Use with "term mode".
- *	
+ *
  */
 #define _XOPEN_SOURCE 500
 #include <stdio.h>		/* needed by testhead.h		*/
@@ -144,7 +144,7 @@
 	}
 	close(fd);
 
-	
+
 	/*
 	 * Default values for run conditions.
 	 */
@@ -272,7 +272,7 @@
 	int	r_ioveclen;
 
 	/* Stuff for the writev call */
-							
+						
 	struct	iovec	val0_iovec[MAXIOVCNT];
 	struct	iovec	val_iovec[MAXIOVCNT];
 	int	w_ioveclen;
@@ -286,7 +286,7 @@
 		tst_resm(TBROK, "\tmalloc failed(buf)");
 		tst_exit();
 	}
-	
+
 	/*Allocate memory for the iovec buffers and init the iovec arrays
 	 */
 	r_ioveclen = w_ioveclen = csize / MAXIOVCNT;
@@ -315,7 +315,7 @@
 			tst_exit();
 		}
 		val0_iovec[i].iov_len = w_ioveclen;
-		
+	
 		if(malloc((i+1)*8) == 0) {
 			tst_resm(TBROK, "\tmalloc failed");
 			tst_exit();
@@ -503,7 +503,7 @@
 		tst_resm(TFAIL, "\tTest[%d]: fsync error %d.", me, errno);
 		tst_exit();
 	}
-	
+
 	++misc_cnt[(int)1];
 	return 0;
 }
diff --git a/testcases/kernel/fs/ftest/ftest05.c b/testcases/kernel/fs/ftest/ftest05.c
index 982070f..24fac1d 100644
--- a/testcases/kernel/fs/ftest/ftest05.c
+++ b/testcases/kernel/fs/ftest/ftest05.c
@@ -46,7 +46,7 @@
  * CAUTION!!
  *	If a file is supplied to this program with the "-f" option
  *	it will be removed with a system("rm -rf filename") call.
- *	
+ *
  */
 
 #define _XOPEN_SOURCE 500
@@ -160,7 +160,7 @@
 		tst_exit();
 	}
 
-	
+
 	/*
 	 * Default values for run conditions.
 	 */
@@ -175,7 +175,7 @@
 		perror("sigset failed");
 		exit(3);
 	}
-	
+
 	local_flag = PASSED;
 
 	return;
diff --git a/testcases/kernel/fs/ftest/ftest06.c b/testcases/kernel/fs/ftest/ftest06.c
index 4738bf9..39708e3 100644
--- a/testcases/kernel/fs/ftest/ftest06.c
+++ b/testcases/kernel/fs/ftest/ftest06.c
@@ -26,7 +26,7 @@
  * CALLS
  *	open, close,  read, write, llseek,
  *	unlink, chdir
- *	
+ *
  *
  * ALGORITHM
  *
@@ -148,7 +148,7 @@
 		/*
 		 * Make a directory to do this in; ignore error if already exists.
 		 */
-		
+	
 		parent_pid = getpid();
 		tst_tmpdir();
 
@@ -510,14 +510,14 @@
 	register int i;
 
 	tst_resm(TINFO, "\tterm -[%d]- got sig term.", getpid());
-	
+
 	if (parent_pid == getpid()) {
 		for (i=0; i < nchild; i++)
 			if (pidlist[i])		/* avoid embarassment */
 				kill(pidlist[i], SIGTERM);
 		return 0;
 	}
-	
+
 	tst_resm(TBROK, "Term: Child process exiting.");
 	tst_exit();
 	return 0;
diff --git a/testcases/kernel/fs/ftest/ftest07.c b/testcases/kernel/fs/ftest/ftest07.c
index ffec89b..2b2aa7c 100644
--- a/testcases/kernel/fs/ftest/ftest07.c
+++ b/testcases/kernel/fs/ftest/ftest07.c
@@ -51,7 +51,7 @@
  * CAUTION!!
  *	If a file is supplied to this program with the "-f" option
  *	it will be removed with a system("rm -rf filename") call.
- *	
+ *
  *
  */
 
@@ -277,7 +277,7 @@
 	if (status) {
 		tst_resm(TINFO, "CAUTION - ftest07, '%s' may not be removed", fuss);
 	}
-	
+
 	sync();				/* safeness */
 	return 0;
 }
@@ -369,7 +369,7 @@
 			exit(1);
 		}
 		val_iovec[i].iov_len = w_ioveclen;
-		
+	
 		if(malloc((i+1)*8) == 0) {
 			tst_resm(TBROK, "\tmalloc failed((i+1)*8)");
 			tst_exit();
diff --git a/testcases/kernel/fs/ftest/ftest08.c b/testcases/kernel/fs/ftest/ftest08.c
index a37f3b5..5ed6598 100644
--- a/testcases/kernel/fs/ftest/ftest08.c
+++ b/testcases/kernel/fs/ftest/ftest08.c
@@ -26,7 +26,7 @@
  *
  * CALLS
  *	fsync, sync, lseek64, read, write
- *	
+ *
  *
  * ALGORITHM
  *	Several child processes doing random seeks, read/write
@@ -36,7 +36,7 @@
  * RESTRICTIONS
  *	Runs a long time with default args - can take others on input
  *	line.  Use with "term mode".
- *	
+ *
  */
 
 #define _XOPEN_SOURCE 500
@@ -276,7 +276,7 @@
 	int	r_ioveclen;
 
 	/* Stuff for the writev call */
-							
+						
 	struct	iovec	val0_iovec[MAXIOVCNT];
 	struct	iovec	val_iovec[MAXIOVCNT];
 	int	w_ioveclen;
@@ -290,7 +290,7 @@
 		tst_resm(TBROK, "\tmalloc failed(buf)");
 		tst_exit();
 	}
-	
+
 	/*Allocate memory for the iovec buffers and init the iovec arrays
 	 */
 	r_ioveclen = w_ioveclen = csize / MAXIOVCNT;
@@ -319,7 +319,7 @@
 			tst_exit();
 		}
 		val0_iovec[i].iov_len = w_ioveclen;
-		
+	
 		if(malloc((i+1)*8) == 0) {
 			tst_resm(TBROK, "\tmalloc failed((i+1)*8)");
 			tst_exit();
diff --git a/testcases/kernel/fs/inode/inode01.c b/testcases/kernel/fs/inode/inode01.c
index 2e36893..1b6d39d 100644
--- a/testcases/kernel/fs/inode/inode01.c
+++ b/testcases/kernel/fs/inode/inode01.c
@@ -132,7 +132,7 @@
 	}
 
 	blenter();
-	
+
 
 	/********************************/
 	/*				*/
@@ -172,7 +172,7 @@
 		fprintf(temp,"\t\n%s The path_list file cannot be created, errno=%d \n", root, errno);
 		fail_exit();
 	}
-	
+
 	/****************************************/
 	/*					*/
 	/*   and store its name in path_list	*/
@@ -327,7 +327,7 @@
 			get_next_name();
 			strcpy(new_string, string);
 			strcat(new_string, slash);
-			strcat(new_string, name);	
+			strcat(new_string, name);
 
 			/****************************************/
 			/*					*/
@@ -348,7 +348,7 @@
 				file_id = creat(new_string, FILE_MODE);
 				if(file_id == -1) {
 					fprintf(temp,"\tImpossible to create file %s, errno=%d\n",
-						new_string, errno);		
+						new_string, errno);	
 					return(-2);
 				}
 
@@ -369,8 +369,8 @@
 					if(ret_len != len) {
 						fprintf(temp,"\tUnsuccessful write to file %s, expected return of %d, got %d, errno=%d\n",
 						new_string, len, ret_len, errno);
-						return(-3);	
-					}		
+						return(-3);
+					}	
 				}
 				close(file_id);
 
@@ -384,7 +384,7 @@
 				len = strlen(write_string);
 				write_string[len++] = 'F';
 				write_string[len] = '\0';
-				escrivez(write_string);	
+				escrivez(write_string);
 			}
 			else {
 				switch_flag = TRUE;
@@ -417,7 +417,7 @@
 				len = strlen(write_string);
 				write_string[len++] = 'D';
 				write_string[len] = '\0';
-				escrivez(write_string);	
+				escrivez(write_string);
 
 				/****************************************/
 				/*					*/
@@ -428,7 +428,7 @@
 				new_level = level + 1;
 				new_ret_val = generate(new_string, new_level);
 				if(new_ret_val < ret_val)
-					ret_val = new_ret_val;	
+					ret_val = new_ret_val;
 			}
 		}
 
@@ -471,13 +471,13 @@
 		/*					*/
 		/****************************************/
 
-		
+	
 		if(fscanf(list_stream, "%s", path_string) == EOF) {
 
 #ifdef PRINT
 			printf("\nEnd of path_list file reached \n");
 #endif
-		
+	
 			return 0;
 		}
 
@@ -502,14 +502,14 @@
 					path_string, errno);
 				return(-1);
 			}
-				
+			
 			else {
 				/********************************/
 				/*				*/
 				/*    check its contents	*/
 				/*				*/
 				/********************************/
-				
+			
 				len = strlen(path_string);
 				for(j = 1; j <= FILE_LENGTH; j++) {
 					ret_len = read(file_id, read_string, len);
@@ -530,7 +530,7 @@
 					if(ret_len <= 0) {
 						fprintf(temp,"\tImpossible to read file %s\n", path_string);
 						return(-2);
-					}	
+					}
 		}
 		else {
 
@@ -608,17 +608,17 @@
 	int next_position;
 
 	if(name[position] == 'z')
-		if(position == 0) {	
+		if(position == 0) {
 			fprintf(temp,"\tERROR: There are no more available names\n");
 			fail_exit();
 		}
 		else {
-			name[position] = 'a';          /**********************/	
+			name[position] = 'a';          /**********************/
 			next_position = --position;    /*		     */
 			increment_name(next_position); /*  increment the     */
 						       /*  previous letter   */
 						       /*		     */
-						       /**********************/	
+						       /**********************/
 		}
 				  /*********************************/
 				  /*				   */
diff --git a/testcases/kernel/fs/inode/inode02.c b/testcases/kernel/fs/inode/inode02.c
index e0b9e23..1f5639a 100644
--- a/testcases/kernel/fs/inode/inode02.c
+++ b/testcases/kernel/fs/inode/inode02.c
@@ -301,7 +301,7 @@
 		  path_list_string, errno);
 		exit(-7);
 	}
-	
+
 	/****************************************/
 	/*					*/
 	/*   and store its name in path_list	*/
@@ -432,7 +432,7 @@
 			get_next_name();
 			strcpy(new_string, string);
 			strcat(new_string, slash);
-			strcat(new_string, name);	
+			strcat(new_string, name);
 
 			/****************************************/
 			/*					*/
@@ -453,7 +453,7 @@
 				file_id = creat(new_string, FILE_MODE);
 				if(file_id == -1) {
 					fprintf(temp,"\nImpossible to create file %s, errno=%d\n",
-						new_string, errno);		
+						new_string, errno);	
 					return(-2);
 				}
 
@@ -474,8 +474,8 @@
 					if(ret_len != len) {
 						fprintf(temp,"\nUnsuccessful write to file %s, errno=%d\n",
 						  new_string, errno);
-						return(-3);	
-					}		
+						return(-3);
+					}	
 				}
 				close(file_id);
 
@@ -489,7 +489,7 @@
 				len = strlen(write_string);
 				write_string[len++] = 'F';
 				write_string[len] = '\0';
-				escrivez(write_string);	
+				escrivez(write_string);
 			}
 			else {
 				switch_flag = TRUE;
@@ -499,7 +499,7 @@
 				/*	 or make a directory		*/
 				/*					*/
 				/*  (mknod can only be called when in	*/
-				/*   super user mode)			*/	
+				/*   super user mode)			*/
 				/*					*/
 				/****************************************/
 
@@ -526,7 +526,7 @@
 				len = strlen(write_string);
 				write_string[len++] = 'D';
 				write_string[len] = '\0';
-				escrivez(write_string);	
+				escrivez(write_string);
 
 				/****************************************/
 				/*					*/
@@ -537,7 +537,7 @@
 				new_level = level + 1;
 				new_ret_val = generate(new_string, new_level);
 				if(new_ret_val < ret_val)
-					ret_val = new_ret_val;	
+					ret_val = new_ret_val;
 			}
 		}
 
@@ -580,13 +580,13 @@
 		/*					*/
 		/****************************************/
 
-		
+	
 		if(fscanf(list_stream, "%s", path_string) == EOF) {
 
 #ifdef DEBUG
 			tst_resm(TINFO,"\nEnd of path_list file reached \n");
 #endif
-		
+	
 			return 0;
 		}
 
@@ -611,15 +611,15 @@
 					path_string, errno);
 				return(-1);
 			}
-				
+			
 			else {
 				/********************************/
 				/*				*/
 				/*    check its contents	*/
 				/*				*/
 				/********************************/
-			
-				ret_len=0;	
+		
+				ret_len=0;
 				len = strlen(path_string);
 				for(j = 1; j <= file_length; j++) {
 					ret_len = read(file_id, read_string, len);
@@ -641,7 +641,7 @@
 						fprintf(temp,"\nImpossible to read file %s, errno=%d\n",
 						path_string, errno);
 						return(-2);
-					}	
+					}
 		}
 		else {
 
@@ -721,17 +721,17 @@
 	int next_position;
 
 	if(name[position] == 'z')
-		if(position == 0) {	
+		if(position == 0) {
 			fprintf(temp,"ERROR: There are no more available names\n");
 			exit(-1);
 		}
 		else {
-			name[position] = 'a';          /**********************/	
+			name[position] = 'a';          /**********************/
 			next_position = --position;    /*		     */
 			increment_name(next_position); /*  increment the     */
 						       /*  previous letter   */
 						       /*		     */
-						       /**********************/	
+						       /**********************/
 		}
 				  /*********************************/
 				  /*				   */
diff --git a/testcases/kernel/fs/mongo/mongo_compare.c b/testcases/kernel/fs/mongo/mongo_compare.c
index a8f6c8e..9052536 100644
--- a/testcases/kernel/fs/mongo/mongo_compare.c
+++ b/testcases/kernel/fs/mongo/mongo_compare.c
@@ -98,18 +98,18 @@
     write_html_head(f4);
     i=0;
     while( fgets(line1, 100, f1) ){
-	   fgets(line2, 100, f2);	
-	
+	   fgets(line2, 100, f2);
+
 	 if ( p=strstr(line1,"\n")) *(p+1)=0;
 	 if ( p=strstr(line2,"\n")) *(p+1)=0;
-	
+
 	 strcpy(line3,line1);
 	 line3[strlen(line3)-1]=0;
-	
+
 	 while ( strlen(line3) < 40 ){
 	     strcat(line3," ");
 	 }
-	
+
 	 if (strstr(line3,"MONGO_")){
 	    fprintf(f4,"</table>\n<table BORDER NOSAVE >\n");
 	    fprintf(f4,"<tr BGCOLOR=\"#CCFFFF\" NOSAVE>");
@@ -117,7 +117,7 @@
 	    i=0;
 	 }
 	 if(i<20) strcpy(tmp_str[i],line2);
-	
+
 	 if (strstr(line3,"FSYS=")) {
 	     fprintf(f4, "</td><td>\n");
 	     for (k=0; k<i; k++){
@@ -127,7 +127,7 @@
 	     i=20;
 	 }    
 	 else if ( NULL == strstr(line3, " :" )) {
-	
+
 	     if (strstr(line3, "(time") ) fprintf(f4,"<br><tt><center>%s</center></tt>\n",line3);
 	     else {
 	         k=0; p=line3;
@@ -136,27 +136,27 @@
 	         }
 	         if (k > 0) {
 	             fprintf(f4, "<tt>%s</tt><br>\n", line3);
-	             if (i<20) i++;    	
+	             if (i<20) i++;    
 	         }
 	    }
 	 }  
-	
+
 	 else if (strstr(line3,"Create")) fprintf (f4, "</td>\n");
-	
-	 line2[strlen(line2)-1]=0;	
+
+	 line2[strlen(line2)-1]=0;
 	 while ( strlen(line2) < 40 ){
 	     strcat(line2," ");
 	 }
-	
+
 	 strcat(line3,line2);
-	
-	
+
+
 	 strcpy(out_line, line3);
-	 strcat(out_line, "\n"); 	 	
+	 strcat(out_line, "\n"); 	 
 	 name_str1[0]=0;
-	
+
 	 if ( p1=strstr(line1, " :" )) {
-	      strcpy(time_str1, p1+2);	      	 		
+	      strcpy(time_str1, p1+2);	      	 	
 	      strncpy(name_str1, line1, p1-line1);
 	     
 	      if ( p2=strstr(line2, " :" )) {
@@ -177,8 +177,8 @@
 		  	 
 	      }
 	 }
-	
-         fprintf (f3, "%s", out_line);	
+
+         fprintf (f3, "%s", out_line);
 	 line1[0] = 0;
 	 line2[0] = 0;
 	 line3[0] = 0;
diff --git a/testcases/kernel/fs/mongo/reiser_fract_tree.c b/testcases/kernel/fs/mongo/reiser_fract_tree.c
index c1f1a65..07bc345 100644
--- a/testcases/kernel/fs/mongo/reiser_fract_tree.c
+++ b/testcases/kernel/fs/mongo/reiser_fract_tree.c
@@ -89,7 +89,7 @@
 
 /* this is the core statistical distribution function, and it is used for file
    sizes, directory sizes, etc. */
-int determine_size(double median_size, 			
+int determine_size(double median_size, 		
 		   double max_size	/* The maximal value of size */ )
 {
   /* when x is half of its random range (max_size/median_size), result is
@@ -292,7 +292,7 @@
 	already exist.  Thus we ignore EEXIST, and pay attention to all else. */
     if ( errno != EEXIST ) {
       perror ("mkdir");
-      exit (errno);			
+      exit (errno);		
     }
   }
   sprintf(dirname, "d%lu", this_directory_number++);
diff --git a/testcases/kernel/fs/openfile/openfile.c b/testcases/kernel/fs/openfile/openfile.c
index a3c6ff4..565ecba 100644
--- a/testcases/kernel/fs/openfile/openfile.c
+++ b/testcases/kernel/fs/openfile/openfile.c
@@ -64,7 +64,7 @@
 /* **************************************************************************
    *                              MAIN PROCEDURE                            *
    ************************************************************************** */
-	
+
 int main(int argc, char *argv[])
 {
 	int 	   i,opt,badopts=0;
@@ -114,7 +114,7 @@
 	}
 
 	/* Create files */
-	if ((fd=fopen(filename,"w")) == NULL){	
+	if ((fd=fopen(filename,"w")) == NULL){
 		perror ("FAIL - Could not create file");
 		_exit(1);
 	}
@@ -210,7 +210,7 @@
 		unlink(filename);
 		pthread_exit((void*)1);
 	}
-	
+
 	/* Check if you should wake up main thread */
         if (++c.thr_sleeping == numthreads)
                 if (pthread_cond_signal(&c.init_cv)){
diff --git a/testcases/kernel/fs/scsi/ltpscsi/scsimain.c b/testcases/kernel/fs/scsi/ltpscsi/scsimain.c
index b07fe09..3375435 100644
--- a/testcases/kernel/fs/scsi/ltpscsi/scsimain.c
+++ b/testcases/kernel/fs/scsi/ltpscsi/scsimain.c
@@ -1357,7 +1357,7 @@
 	break;
     }
 }
-	
+
 static int fetchTemperature(int sg_fd, int do_hex, unsigned char * resp,
 			    int max_len)
 {
@@ -2634,7 +2634,7 @@
 	    printf("standard INQUIRY:\n");
 	if (num_opcode > 0)
 	    printf(" <<given opcode or page_code is being ignored>>\n");
-	
+
         if (0 == do_scsi_inq(sg_fd, 0, 0, 0, rsp_buff, 36, 1)) {
 	    len = rsp_buff[4] + 5;
 	    ansi_version = rsp_buff[2] & 0x7;
@@ -3063,7 +3063,7 @@
         if (res < 0) {
             snprintf(ebuff, EBUFF_SZ, "Error closing %s ", fname);
             perror("sg_map: close error");
-#ifndef IGN_CLOSE_ERR		
+#ifndef IGN_CLOSE_ERR	
             return;
 #else
             ++num_errors;
@@ -4272,7 +4272,7 @@
 			printf (" %02x", cmdblk[k]);
 		printf("\n");
 	}
-	
+
 	if (ioctl(fd, SG_IO, &io_hdr) < 0) {
 		perror("start_stop (SG_IO) error");
 		return;
@@ -4317,7 +4317,7 @@
 	io_hdr.cmdp = cmdblk;
 	io_hdr.sbp = sense_b;
 	io_hdr.timeout = DEF_START_TIMEOUT;
-	
+
 	if (ioctl(fd, SG_IO, &io_hdr) < 0) {
 		perror("sync_cache (SG_IO) error");
 		return;
@@ -4347,11 +4347,11 @@
 	int immed = 1;
 	int loej = 0;
 	int power_conds = 0;
-	
+
     print_msg(TEST_BREAK, __FUNCTION__);
 
     file_name  = device;
-		
+	
 	fd = open(file_name, O_RDWR | O_NONBLOCK);
 	if (fd < 0) {
 		fprintf(stderr, "Error trying to open %s\n", file_name);
@@ -4365,15 +4365,15 @@
 		close(fd);
 		return 3;
 	}
-	
+
 	if (synccache)
 		do_sync_cache(fd);
-	
+
 	if (power_conds > 0)
 		do_start_stop(fd, 0, immed, 0, power_conds);
 	else if (startstop != -1)
 		do_start_stop(fd, startstop, immed, loej, 0);
-	
+
 	close (fd);
 	return 0;
 }
@@ -4508,7 +4508,7 @@
 	for (i = 0; i < len/BPI - 1; i++)
 	{
 		/* we rely on rand() giving full range of int */
-		buf[i] = rand ();	
+		buf[i] = rand ();
 		sum += buf[i];
 	}
 	while (rln%BPI)
@@ -4532,7 +4532,7 @@
 	int res;
 	unsigned char * rbBuff = malloc(OFF + sizeof(rbCmdBlk) + size);
 	struct sg_header * rsghp = (struct sg_header *)rbBuff;
-	
+
         int rbInLen = OFF + size;
 	int rbOutLen = OFF + sizeof (rbCmdBlk);
 	memset(rbBuff, 0, OFF + sizeof(rbCmdBlk) + size);
@@ -4586,7 +4586,7 @@
    
         int rbInLen = OFF;
 	int rbOutLen = OFF + sizeof (rbCmdBlk) + size;
-	
+
 	do_fill_buffer ((int*)(rbBuff + OFF + sizeof(rbCmdBlk)), size);
         rsghp->pack_len = 0;                /* don't care */
         rsghp->reply_len = rbInLen;
@@ -4632,7 +4632,7 @@
 	int block_dev = 0;
   
     print_msg(TEST_BREAK, __FUNCTION__);
-	
+
 	sg_fd = open(file_name, O_RDWR);
 	if (sg_fd < 0) {
 		perror("sg_test_rwbuf: open error");
@@ -4652,7 +4652,7 @@
 		return 1;
 	}
 	if (find_out_about_buffer (sg_fd, &buf_capacity, file_name)) return 1;
-	
+
 	cmpbuf = malloc (buf_capacity);
 	if (write_buffer (sg_fd, buf_capacity)) return 3;
 	res = read_buffer (sg_fd, buf_capacity);
@@ -4666,7 +4666,7 @@
 	printf ("Success\n");
 	return 0;
 }
-	
+
 int do_scsi_test_unit_ready(char * device)
 {
     int sg_fd, k;
@@ -7087,7 +7087,7 @@
         if (FT_SG == rcoll.out_type) {
             res = read_capacity(rcoll.outfd, &out_num_sect, &out_sect_sz);
             if (2 == res) {
-                fprintf(stderr, 	
+                fprintf(stderr, 
 			"Unit attention, media changed(out), continuing\n");
                 res = read_capacity(rcoll.outfd, &out_num_sect, &out_sect_sz);
             }
diff --git a/testcases/kernel/fs/stream/stream01.c b/testcases/kernel/fs/stream/stream01.c
index 424d0f0..bbefe27 100644
--- a/testcases/kernel/fs/stream/stream01.c
+++ b/testcases/kernel/fs/stream/stream01.c
@@ -72,7 +72,7 @@
 		sprintf(tempfile1, "stream011.%d", getpid());
 		sprintf(tempfile2, "stream012.%d", getpid());
 	/*--------------------------------------------------------------------*/
-	//block0:	
+	//block0:
 		if((stream=fopen(tempfile1,"a+")) == NULL) {
 			tst_resm(TFAIL,"fopen(%s) a+ failed: %s", tempfile1, strerror(errno));
 			tst_exit();
@@ -123,7 +123,7 @@
 	/*--------------------------------------------------------------------*/
 		unlink(tempfile1);
 		unlink(tempfile2);
-	
+
 	} /* end for */
 	tst_rmdir();
 	tst_exit();
diff --git a/testcases/kernel/fs/stream/stream02.c b/testcases/kernel/fs/stream/stream02.c
index 7d1ce1a..ec41290 100644
--- a/testcases/kernel/fs/stream/stream02.c
+++ b/testcases/kernel/fs/stream/stream02.c
@@ -114,7 +114,7 @@
 		} else {
 		         tst_resm(TFAIL, "Test failed in block1.");
 	        }
-			
+		
 	/*--------------------------------------------------------------------*/
 	} /* end for */
 	tst_rmdir();
diff --git a/testcases/kernel/fs/stream/stream03.c b/testcases/kernel/fs/stream/stream03.c
index 5486185..3f165af 100644
--- a/testcases/kernel/fs/stream/stream03.c
+++ b/testcases/kernel/fs/stream/stream03.c
@@ -75,7 +75,7 @@
 
 		sprintf(tempfile1, "stream03.%d", getpid());
 	/*--------------------------------------------------------------------*/
-	//block0:	
+	//block0:
 		if((stream=fopen(tempfile1,"a+")) == NULL) {
 			tst_resm(TBROK,"fopen(%s) a+ failed: %s", tempfile1, strerror(errno));
 			tst_exit();
@@ -154,7 +154,7 @@
 
 		unlink(tempfile1);
 	/*--------------------------------------------------------------------*/
-	//block1:	
+	//block1:
 		if((stream=fopen(tempfile1,"a+")) == NULL) {
 			tst_resm(TFAIL,"fopen(%s) a+ failed: %s", tempfile1, strerror(errno));
 			tst_exit();
diff --git a/testcases/kernel/fs/stream/stream04.c b/testcases/kernel/fs/stream/stream04.c
index 7333eb1..ecf5d51 100644
--- a/testcases/kernel/fs/stream/stream04.c
+++ b/testcases/kernel/fs/stream/stream04.c
@@ -77,7 +77,7 @@
 
 		sprintf(tempfile1, "stream04.%d", getpid());
 	/*--------------------------------------------------------------------*/
-	//block0:	
+	//block0:
 		if((stream=fopen(tempfile1,"a+")) == NULL) {
 			tst_resm(TFAIL,"fopen(%s) a+ failed: %s", tempfile1, strerror(errno));
 			tst_rmdir();
diff --git a/testcases/kernel/fs/stream/stream05.c b/testcases/kernel/fs/stream/stream05.c
index 4c2e8c7..c8b7a65 100644
--- a/testcases/kernel/fs/stream/stream05.c
+++ b/testcases/kernel/fs/stream/stream05.c
@@ -79,7 +79,7 @@
 
 		sprintf(tempfile, "stream05.%d", getpid());
 	/*--------------------------------------------------------------------*/
-	//block0:	
+	//block0:
 		if((stream=fopen(tempfile,"a+")) == NULL) {
 			tst_resm(TFAIL,"fopen(%s) a+ failed: %s", tempfile, strerror(errno));
 			tst_exit();
@@ -107,7 +107,7 @@
 		local_flag = PASSED;
 
 	/*--------------------------------------------------------------------*/
-	//block1:	
+	//block1:
 
 		/* check that fileno returns valid file descriptor */
 		fd=fileno(stream);
@@ -131,7 +131,7 @@
 
 		local_flag = PASSED;
 	/*--------------------------------------------------------------------*/
-	//block2:	
+	//block2:
 
 		/* read to EOF and ensure feof returns non-zero */
 		fclose(stream);
@@ -158,7 +158,7 @@
 
 		local_flag = PASSED;
 	/*--------------------------------------------------------------------*/
-	//block3:	
+	//block3:
 		/* ensure clearerr works */
 		clearerr(stream);
 		if(feof(stream) != 0) {
@@ -173,7 +173,7 @@
 
 		local_flag = PASSED;
 	/*--------------------------------------------------------------------*/
-	//block4:	
+	//block4:
 
 		/* test fopen "b" flags -- should be allowed but ignored */
 		(void) fclose(stream);