summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2013-07-11 21:42:54 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-11 21:42:54 +0200
commita69b50c567d46afad73c4d6ab9e57f078ee73327 (patch)
treecbfb26d397c47eb914e9f5fbfa752d9891075de3
parentam e8d953aa: recovery: more cargo-cult programming (diff)
parentrecovery: remove O_DIRECT, use O_SYNC only (diff)
downloadandroid_bootable_recovery-a69b50c567d46afad73c4d6ab9e57f078ee73327.tar
android_bootable_recovery-a69b50c567d46afad73c4d6ab9e57f078ee73327.tar.gz
android_bootable_recovery-a69b50c567d46afad73c4d6ab9e57f078ee73327.tar.bz2
android_bootable_recovery-a69b50c567d46afad73c4d6ab9e57f078ee73327.tar.lz
android_bootable_recovery-a69b50c567d46afad73c4d6ab9e57f078ee73327.tar.xz
android_bootable_recovery-a69b50c567d46afad73c4d6ab9e57f078ee73327.tar.zst
android_bootable_recovery-a69b50c567d46afad73c4d6ab9e57f078ee73327.zip
-rw-r--r--applypatch/applypatch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/applypatch/applypatch.c b/applypatch/applypatch.c
index 60e26ede3..0dcdce0b1 100644
--- a/applypatch/applypatch.c
+++ b/applypatch/applypatch.c
@@ -424,7 +424,7 @@ int WriteToPartition(unsigned char* data, size_t len,
{
size_t start = 0;
int success = 0;
- int fd = open(partition, O_RDWR | O_DIRECT | O_SYNC);
+ int fd = open(partition, O_RDWR | O_SYNC);
if (fd < 0) {
printf("failed to open %s: %s\n", partition, strerror(errno));
return -1;
@@ -433,7 +433,7 @@ int WriteToPartition(unsigned char* data, size_t len,
for (attempt = 0; attempt < 10; ++attempt) {
size_t next_sync = start + (1<<20);
- printf("raw O_DIRECT write %s attempt %d start at %d\n", partition, attempt+1, start);
+ printf("raw O_SYNC write %s attempt %d start at %d\n", partition, attempt+1, start);
lseek(fd, start, SEEK_SET);
while (start < len) {
size_t to_write = len - start;