X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.c;h=1e69ce4228c624f3775a95e3299bde84c1e0baef;hb=b3f378e90231ecb2082ec565bafb3f721c4f1902;hp=fcf3ae80c1fd5316c0ce121434eef2426b4471fe;hpb=492158cf6a2e81886c43a6e696b17d7160ec5540;p=fio.git

diff --git a/fio.c b/fio.c
index fcf3ae80..1e69ce42 100644
--- a/fio.c
+++ b/fio.c
@@ -614,7 +614,6 @@ static void fill_io_buf(struct thread_data *td, struct io_u *io_u, int max_bs)
 
 static int init_io_u(struct thread_data *td)
 {
-	unsigned long long buf_size;
 	struct io_u *io_u;
 	unsigned int max_bs;
 	int i, max_units;
@@ -626,24 +625,24 @@ static int init_io_u(struct thread_data *td)
 		max_units = td->o.iodepth;
 
 	max_bs = max(td->o.max_bs[DDIR_READ], td->o.max_bs[DDIR_WRITE]);
-	buf_size = (unsigned long long) max_bs * (unsigned long long) max_units;
-	buf_size += page_mask;
-	if (buf_size != (size_t) buf_size) {
-		log_err("fio: IO memory too large. Reduce max_bs or iodepth\n");
-		return 1;
-	}
-
-	td->orig_buffer_size = buf_size;
+	td->orig_buffer_size = (unsigned long long) max_bs * (unsigned long long) max_units;
 
 	if (td->o.mem_type == MEM_SHMHUGE || td->o.mem_type == MEM_MMAPHUGE)
 		td->orig_buffer_size = (td->orig_buffer_size + td->o.hugepage_size - 1) & ~(td->o.hugepage_size - 1);
-	else if (td->orig_buffer_size & page_mask)
-		td->orig_buffer_size = (td->orig_buffer_size + page_mask) & ~page_mask;
+
+	if (td->orig_buffer_size != (size_t) td->orig_buffer_size) {
+		log_err("fio: IO memory too large. Reduce max_bs or iodepth\n");
+		return 1;
+	}
 
 	if (allocate_io_mem(td))
 		return 1;
 
-	p = ALIGN(td->orig_buffer);
+	if (td->o.odirect)
+		p = ALIGN(td->orig_buffer);
+	else
+		p = td->orig_buffer;
+
 	for (i = 0; i < max_units; i++) {
 		if (td->terminate)
 			return 1;