From 23b01621fff9c657b247e988d3f5082a7cd23a8d Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Tue, 10 Apr 2018 15:33:30 +0200 Subject: [PATCH] Print better debug message for open with write mode. --- lib/luks2/luks2_luks1_convert.c | 2 -- lib/utils_device.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/luks2/luks2_luks1_convert.c b/lib/luks2/luks2_luks1_convert.c index 08a3ddc1..561ef382 100644 --- a/lib/luks2/luks2_luks1_convert.c +++ b/lib/luks2/luks2_luks1_convert.c @@ -436,7 +436,6 @@ static int move_keyslot_areas(struct crypt_device *cd, off_t offset_from, devfd = device_open(device, O_RDWR); if (devfd == -1) { - log_dbg("Cannot open device %s.", device_path(device)); free(buf); return -EIO; } @@ -488,7 +487,6 @@ static int luksmeta_header_present(struct crypt_device *cd, off_t luks1_size) devfd = device_open(device, O_RDONLY); if (devfd == -1) { - log_dbg("Cannot open device %s.", device_path(device)); free(buf); return -EIO; } diff --git a/lib/utils_device.c b/lib/utils_device.c index 7649c695..11d23544 100644 --- a/lib/utils_device.c +++ b/lib/utils_device.c @@ -246,7 +246,9 @@ static int device_open_internal(struct device *device, int flags) devfd = open(device_path(device), flags); if (devfd < 0) - log_dbg("Cannot open device %s.", device_path(device)); + log_dbg("Cannot open device %s%s.", + device_path(device), + (flags & O_ACCMODE) != O_RDONLY ? " for write" : ""); return devfd; }