commit a892eb154e0b578571674eea5f69fa4fbf7c89da
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 07 20:09:34 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 07 20:09:34 2019 +0000
tree 650f295aef69696501a5fa1618ea8084741fcf0b
parent 1ea17070fe9a008d1ad5a01b142d7eb67a272c9a
parent 621d9b9732f929f25df5a7b4f2199bf762dd44dd

Merge "Fsync directories after creating files"

cryptfs.cpp

diff --git a/cryptfs.cpp b/cryptfs.cpp
index 28facac..d661952 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -1144,6 +1144,7 @@
     char buffer[DM_CRYPT_BUF_SIZE];
     struct dm_ioctl* io;
     int retval = -1;
+    int err;
 
     if ((fd = open("/dev/device-mapper", O_RDWR | O_CLOEXEC)) < 0) {
         SLOGE("Cannot open device-mapper\n");
@@ -1153,8 +1154,9 @@
     io = (struct dm_ioctl*)buffer;
 
     ioctl_init(io, DM_CRYPT_BUF_SIZE, name, 0);
-    if (ioctl(fd, DM_DEV_REMOVE, io)) {
-        SLOGE("Cannot remove dm-crypt device\n");
+    err = ioctl(fd, DM_DEV_REMOVE, io);
+    if (err) {
+        SLOGE("Cannot remove dm-crypt device %s: %s\n", name, strerror(errno));
         goto errout;
     }