Test device read only once for O_DIRECT.

Also do not report error for disappeared device (it is reported later on real access).

1 files changed, 9 insertions, 12 deletions

diff --git a/lib/utils_device.c b/lib/utils_device.c
index acfbfc6..46c2a0f 100644
--- a/lib/utils_device.c
+++ b/lib/utils_device.c
@@ -111,28 +111,25 @@ static int device_ready(struct device *device, int check_directio)
 	int devfd = -1, r = 0;
 	struct stat st;
 
+	device->o_direct = 0;
 	if (check_directio) {
 		log_dbg("Trying to open and read device %s with direct-io.",
 			device_path(device));
 		devfd = open(device_path(device), O_RDONLY | O_DIRECT);
-		if (devfd >= 0 && device_read_test(devfd) == 0) {
-			device->o_direct = 1;
-		} else {
-			close(devfd);
-			devfd = -1;
+		if (devfd >= 0) {
+			if (device_read_test(devfd) == 0) {
+				device->o_direct = 1;
+			} else {
+				close(devfd);
+				devfd = -1;
+			}
 		}
 	}
 
 	if (devfd < 0) {
-		log_dbg("Trying to open and read device %s without direct-io.",
+		log_dbg("Trying to open device %s without direct-io.",
 			device_path(device));
 		devfd = open(device_path(device), O_RDONLY);
-		if (devfd >= 0 && device_read_test(devfd) == 0) {
-			device->o_direct = 0;
-		} else {
-			close(devfd);
-			devfd = -1;
-		}
 	}
 
 	if (devfd < 0) {