X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=trim.c;h=434554129453915515a5b64d47bbed6e914bf765;hp=a9b15d686606bee6856b3998e5b7104bc633ac18;hb=01cbd4d913d4eed56dc51256cddfe327b9c28d4c;hpb=4c07ad86c6cc6e158c70a5c625f60144db03f20d

diff --git a/trim.c b/trim.c
index a9b15d68..43455412 100644
--- a/trim.c
+++ b/trim.c
@@ -24,7 +24,7 @@ int get_next_trim(struct thread_data *td, struct io_u *io_u)
 		return 1;
 
 	assert(td->trim_entries);
-	ipo = flist_entry(td->trim_list.next, struct io_piece, trim_list);
+	ipo = flist_first_entry(&td->trim_list, struct io_piece, trim_list);
 	remove_trim_entry(td, ipo);
 
 	io_u->offset = ipo->offset;
@@ -70,18 +70,15 @@ int get_next_trim(struct thread_data *td, struct io_u *io_u)
 int io_u_should_trim(struct thread_data *td, struct io_u *io_u)
 {
 	unsigned long long val;
-	long r;
+	uint64_t frand_max;
+	unsigned long r;
 
 	if (!td->o.trim_percentage)
 		return 0;
 
-	if (td->o.use_os_rand) {
-		r = os_random_long(&td->trim_state);
-		val = (OS_RAND_MAX / 100ULL);
-	} else {
-		r = __rand(&td->__trim_state);
-		val = (FRAND_MAX / 100ULL);
-	}
+	frand_max = rand_max(&td->trim_state);
+	r = __rand(&td->trim_state);
+	val = (frand_max / 100ULL);
 
 	val *= (unsigned long long) td->o.trim_percentage;
 	return r <= val;