Recent changes (master)

PATCH Jens Axboe 1 participant 1 message May 11, 2015

lore

Share & tools

lore

Jens Axboe

author

2015-05-11 12:00 UTC #0 lore raw

The following changes since commit 94d8288ef299b544d518da69f21a6df9a04eb086:

Merge branch 'master' of ssh://git.kernel.dk/data/git/fio (2015-05-08 09:21:17 -0600)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to bddc8d161ac433712d601765dbf455349f9dada1:

workqueue: style cleanup (2015-05-10 11:16:40 -0600)

----------------------------------------------------------------
Jens Axboe (1):
workqueue: style cleanup

 workqueue.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

---

Diff of recent changes:

workqueue.c +9 ~~-10~~

index 92088ba..b9a967f 100644
@@ -401,13 +401,8 @@ int workqueue_init(struct thread_data *td, struct workqueue *wq,
 			break;
 
 	wq->max_workers = i;
-	if (!wq->max_workers) {
-err:
-		log_err("Can't create rate workqueue\n");
-		td_verror(td, ESRCH, "workqueue_init");
-		workqueue_exit(wq);
-		return 1;
-	}
+	if (!wq->max_workers)
+		goto err;
 
 	/*
 	 * Wait for them all to be started and initialized

@@ -437,8 +432,12 @@ err:
 		pthread_mutex_unlock(&wq->flush_lock);
 	} while (1);
 
-	if (error)
-		goto err;
+	if (!error)
+		return 0;
 
-	return 0;
+err:
+	log_err("Can't create rate workqueue\n");
+	td_verror(td, ESRCH, "workqueue_init");
+	workqueue_exit(wq);
+	return 1;
 }