summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-08-04 20:33:00 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-04 20:33:00 +0200
commit393d1e739fc10e526bd3b7b83836a266bfa24079 (patch)
tree121b450c98df90d13ed36b4e2ed0270f0a69f4a6
parentam 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image." (diff)
parentMerge "udpater: Call fsync() after rename()." (diff)
downloadandroid_bootable_recovery-393d1e739fc10e526bd3b7b83836a266bfa24079.tar
android_bootable_recovery-393d1e739fc10e526bd3b7b83836a266bfa24079.tar.gz
android_bootable_recovery-393d1e739fc10e526bd3b7b83836a266bfa24079.tar.bz2
android_bootable_recovery-393d1e739fc10e526bd3b7b83836a266bfa24079.tar.lz
android_bootable_recovery-393d1e739fc10e526bd3b7b83836a266bfa24079.tar.xz
android_bootable_recovery-393d1e739fc10e526bd3b7b83836a266bfa24079.tar.zst
android_bootable_recovery-393d1e739fc10e526bd3b7b83836a266bfa24079.zip
-rw-r--r--updater/blockimg.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index 77117db05..a7821f362 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -19,6 +19,7 @@
#include <dirent.h>
#include <fcntl.h>
#include <inttypes.h>
+#include <libgen.h>
#include <linux/fs.h>
#include <pthread.h>
#include <stdarg.h>
@@ -686,6 +687,7 @@ static int WriteStash(const char* base, const char* id, int blocks, uint8_t* buf
char *cn = NULL;
int fd = -1;
int rc = -1;
+ int dfd = -1;
int res;
struct stat st;
@@ -744,6 +746,20 @@ static int WriteStash(const char* base, const char* id, int blocks, uint8_t* buf
goto wsout;
}
+ const char* dname;
+ dname = dirname(cn);
+ dfd = TEMP_FAILURE_RETRY(open(dname, O_RDONLY | O_DIRECTORY));
+
+ if (dfd == -1) {
+ fprintf(stderr, "failed to open \"%s\" failed: %s\n", dname, strerror(errno));
+ goto wsout;
+ }
+
+ if (fsync(dfd) == -1) {
+ fprintf(stderr, "fsync \"%s\" failed: %s\n", dname, strerror(errno));
+ goto wsout;
+ }
+
rc = 0;
wsout:
@@ -751,6 +767,10 @@ wsout:
close(fd);
}
+ if (dfd != -1) {
+ close(dfd);
+ }
+
if (fn) {
free(fn);
}