From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 11 Sep 2009 20:29:54 +0000 (+0200)
Subject: Silence the style/whitespace police
X-Git-Tag: fio-1.34~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0b9d69ecb14045cf3b2622ae922756b9889b25e6;hp=2db4ecca2d502c6d26386b5eb918a7957d98afb7;p=fio.git

Silence the style/whitespace police

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/blktrace.c b/blktrace.c
index 4469243e..cdbfea02 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -219,7 +219,7 @@ static void store_ipo(struct thread_data *td, unsigned long long offset,
 	queue_io_piece(td, ipo);
 }
 
-static void handle_trace_notify( struct blk_io_trace *t)
+static void handle_trace_notify(struct blk_io_trace *t)
 {
 	switch (t->action) {
 	case BLK_TN_PROCESS:
diff --git a/eta.c b/eta.c
index 8dbff985..53dcc93a 100644
--- a/eta.c
+++ b/eta.c
@@ -169,7 +169,8 @@ static int thread_eta(struct thread_data *td)
 			}
 		}
 		if (td->o.rate[0] || td->o.rate[1]) {
-			r_eta = (bytes_total / 1024) / (td->o.rate[0] + td->o.rate[1]);
+			r_eta = (bytes_total / 1024) /
+					(td->o.rate[0] + td->o.rate[1]);
 			r_eta += td->o.start_delay;
 		}
 
@@ -264,7 +265,8 @@ void print_thread_status(void)
 			t_rate += td->o.rate[0] + td->o.rate[1];
 			m_rate += td->o.ratemin[0] + td->o.ratemin[1];
 			t_iops += td->o.rate_iops[0] + td->o.rate_iops[1];
-			m_iops += td->o.rate_iops_min[0] + td->o.rate_iops_min[1];
+			m_iops += td->o.rate_iops_min[0] +
+					td->o.rate_iops_min[1];
 			files_open += td->nr_open_files;
 		} else if (td->runstate == TD_RAMP) {
 			nr_running++;
@@ -365,7 +367,7 @@ void print_thread_status(void)
 		iops_str[1] = num2str(iops[1], 4, 1, 0);
 
 		l = printf(": [%s] [%s] [%s/%s /s] [%s/%s iops] [eta %s]",
-				 run_str, perc_str, rate_str[0], rate_str[1], 
+				 run_str, perc_str, rate_str[0], rate_str[1],
 				 iops_str[0], iops_str[1], eta_str);
 		if (l >= 0 && l < linelen_last)
 			printf("%*s", linelen_last - l, "");
diff --git a/filesetup.c b/filesetup.c
index f8f81d2b..70589aa5 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -627,7 +627,8 @@ int setup_files(struct thread_data *td)
 			fio_file_clear_extend(f);
 			if (!td->o.fill_device) {
 				old_len = f->real_file_size;
-				extend_len = f->io_size + f->file_offset - old_len;
+				extend_len = f->io_size + f->file_offset -
+						old_len;
 			}
 			f->real_file_size = (f->io_size + f->file_offset);
 			err = extend_file(td, f);
@@ -790,7 +791,7 @@ int add_file(struct thread_data *td, const char *fname)
 		log_err("fio: smalloc OOM\n");
 		assert(0);
 	}
-		
+
 	f->fd = -1;
 
 	if (td->files_size <= td->files_index) {
@@ -818,7 +819,7 @@ int add_file(struct thread_data *td, const char *fname)
 		log_err("fio: smalloc OOM\n");
 		assert(0);
 	}
-	
+
 	get_file_type(f);
 
 	switch (td->o.file_lock_mode) {
@@ -1019,14 +1020,14 @@ void dup_files(struct thread_data *td, struct thread_data *org)
 			assert(0);
 		}
 		__f->fd = -1;
-	
+
 		if (f->file_name) {
 			__f->file_name = smalloc_strdup(f->file_name);
 			if (!__f->file_name) {
 				log_err("fio: smalloc OOM\n");
 				assert(0);
 			}
-	
+
 			__f->filetype = f->filetype;
 		}
 
diff --git a/io_u.c b/io_u.c
index 96683954..da9d9505 100644
--- a/io_u.c
+++ b/io_u.c
@@ -345,7 +345,7 @@ static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
 	odir = ddir ^ 1;
 	if (td_rw(td) && __should_check_rate(td, odir))
 		td->rate_pending_usleep[odir] -= usec;
-	
+
 	return ddir;
 }
 
@@ -754,7 +754,8 @@ static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
 			opened = 1;
 		}
 
-		dprint(FD_FILE, "goodf=%x, badf=%x, ff=%x\n", goodf, badf, f->flags);
+		dprint(FD_FILE, "goodf=%x, badf=%x, ff=%x\n", goodf, badf,
+								f->flags);
 		if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
 			break;
 
@@ -823,7 +824,8 @@ static int set_io_u_file(struct thread_data *td, struct io_u *io_u)
 		io_u->file = NULL;
 		fio_file_set_done(f);
 		td->nr_done_files++;
-		dprint(FD_FILE, "%s: is done (%d of %d)\n", f->file_name, td->nr_done_files, td->o.nr_files);
+		dprint(FD_FILE, "%s: is done (%d of %d)\n", f->file_name,
+					td->nr_done_files, td->o.nr_files);
 	} while (1);
 
 	return 0;
diff --git a/options.c b/options.c
index ebf5d2e6..549775c5 100644
--- a/options.c
+++ b/options.c
@@ -356,7 +356,7 @@ static int set_cpus_allowed(struct thread_data *td, os_cpu_mask_t *mask,
 				ret = 1;
 				break;
 			}
-	
+
 			dprint(FD_PARSE, "set cpu allowed %d\n", icpu);
 			fio_cpu_set(mask, icpu);
 			icpu++;
@@ -1498,7 +1498,7 @@ static struct fio_option options[] = {
 		.help	= "Create files when they are opened for IO",
 		.def	= "0",
 	},
- 	{
+	{
 		.name	= "pre_read",
 		.type	= FIO_OPT_BOOL,
 		.off1	= td_var_offset(pre_read),
diff --git a/parse.c b/parse.c
index b0ea3d3a..78218615 100644
--- a/parse.c
+++ b/parse.c
@@ -557,7 +557,7 @@ static int opt_cmp(const void *p1, const void *p2)
 
 	o1 = get_option(s1, fio_options, &foo);
 	o2 = get_option(s2, fio_options, &foo);
-	
+
 	prio1 = prio2 = 0;
 	if (o1)
 		prio1 = o1->prio;
diff --git a/smalloc.c b/smalloc.c
index 3dd1b496..409998aa 100644
--- a/smalloc.c
+++ b/smalloc.c
@@ -196,7 +196,7 @@ static int add_pool(struct pool *pool, unsigned int alloc_size)
 	bitmap_blocks = alloc_size / SMALLOC_BPL;
 	alloc_size += bitmap_blocks * sizeof(unsigned int);
 	pool->mmap_size = alloc_size;
-	
+
 	pool->nr_blocks = bitmap_blocks;
 	pool->free_blocks = bitmap_blocks * SMALLOC_BPB;
 
diff --git a/stat.c b/stat.c
index c52620d3..6418cf1f 100644
--- a/stat.c
+++ b/stat.c
@@ -752,7 +752,8 @@ void add_bw_sample(struct thread_data *td, enum fio_ddir ddir, unsigned int bs,
 	if (spent < td->o.bw_avg_time)
 		return;
 
-	rate = (td->this_io_bytes[ddir] - ts->stat_io_bytes[ddir]) * 1000 / spent / 1024;
+	rate = (td->this_io_bytes[ddir] - ts->stat_io_bytes[ddir]) *
+			1000 / spent / 1024;
 	add_stat_sample(&ts->bw_stat[ddir], rate);
 
 	if (ts->bw_log)