Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Mar 2, 2020 Kbuild

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 58d3994d9be0783990af82571cea819b499d526c:

io_uring: we should not need two write barriers for SQ updates (2020-02-26 19:54:12 -0700)

are available in the Git repository at:

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

for you to fetch changes up to 941e3356a7edde556ffd81c9767ded218de20a50:

Merge branch 'genfio-bash' of https://github.com/sitsofe/fio (2020-03-01 15:43:14 -0700)

----------------------------------------------------------------
Jens Axboe (3):
Merge branch 'clean1' of https://github.com/kusumi/fio
Merge branch 'fix-win-raw' of https://github.com/sitsofe/fio
Merge branch 'genfio-bash' of https://github.com/sitsofe/fio

Sitsofe Wheeler (2):
genfio: use /bin/bash hashbang
filesetup: fix win raw disk access and improve dir creation failure msg

Tomohiro Kusumi (1):
Makefile: don't fail to remove conditionally compiled binaries on clean

 Makefile        |  1 +
 filesetup.c     | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
 os/os-windows.h |  6 +++++-
 tools/genfio    |  2 +-
 4 files changed, 56 insertions(+), 5 deletions(-)

---

Diff of recent changes:

Makefile +1 -0
index 027b62bc..72ab39e9 100644
@@ -511,6 +511,7 @@ endif
 
 clean: FORCE
 	@rm -f .depend $(FIO_OBJS) $(GFIO_OBJS) $(OBJS) $(T_OBJS) $(UT_OBJS) $(PROGS) $(T_PROGS) $(T_TEST_PROGS) core.* core gfio unittests/unittest FIO-VERSION-FILE *.[do] lib/*.d oslib/*.[do] crc/*.d engines/*.[do] profiles/*.[do] t/*.[do] unittests/*.[do] unittests/*/*.[do] config-host.mak config-host.h y.tab.[ch] lex.yy.c exp/*.[do] lexer.h
+	@rm -f t/fio-btrace2fio t/io_uring t/read-to-pipe-async
 	@rm -rf  doc/output
 
 distclean: clean FORCE
filesetup.c +49 -3

72 lines not on this page · raw message

os/os-windows.h +5 -1
index 6d48ffe8..fa2955f9 100644
@@ -203,7 +203,11 @@ static inline int fio_mkdir(const char *path, mode_t mode) {
 	}
 
 	if (CreateDirectoryA(path, NULL) == 0) {
-		log_err("CreateDirectoryA = %d\n", GetLastError());
+		/* Ignore errors if path is a device namespace */
+		if (strcmp(path, "\\\\.") == 0) {
+			errno = EEXIST;
+			return -1;
+		}
 		errno = win_to_posix_error(GetLastError());
 		return -1;
 	}
tools/genfio +1 -1
index 286d814d..8518bbcc 100755
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/bash
 #
 #  Copyright (C) 2013 eNovance SAS <[email protected]>
 #  Author: Erwan Velu  <[email protected]>