From: Jens Axboe <axboe@suse.de>
Date: Thu, 13 Jul 2006 17:33:45 +0000 (-0700)
Subject: [PATCH] Fixup nice() return value and duplicate volatiles
X-Git-Tag: fio-1.6~6
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=1056eaadb88722da0803f4d8a45dae9d5015f5e6;ds=sidebyside

[PATCH] Fixup nice() return value and duplicate volatiles
---

diff --git a/fio.c b/fio.c
index 412f0029..3656694b 100644
--- a/fio.c
+++ b/fio.c
@@ -1355,7 +1355,7 @@ static void *thread_main(void *data)
 		}
 	}
 
-	if (nice(td->nice) < 0) {
+	if (nice(td->nice) == -1) {
 		td_verror(td, errno);
 		goto err;
 	}
diff --git a/fio.h b/fio.h
index cc30a15e..a87fcef4 100644
--- a/fio.h
+++ b/fio.h
@@ -424,12 +424,12 @@ extern int init_random_state(struct thread_data *);
  * Naturally this would not work for any type of contended semaphore or
  * for real locking.
  */
-static inline void fio_sem_init(volatile int volatile *sem, int val)
+static inline void fio_sem_init(volatile int *sem, int val)
 {
 	*sem = val;
 }
 
-static inline void fio_sem_down(volatile int volatile *sem)
+static inline void fio_sem_down(volatile int *sem)
 {
 	while (*sem == 0)
 		usleep(10000);
@@ -437,7 +437,7 @@ static inline void fio_sem_down(volatile int volatile *sem)
 	(*sem)--;
 }
 
-static inline void fio_sem_up(volatile int volatile *sem)
+static inline void fio_sem_up(volatile int *sem)
 {
 	(*sem)++;
 }