From 506edb5f7ca1cc6e26cd136177d37cbd5c66a1e1 Mon Sep 17 00:00:00 2001
From: Nick Kralevich <nnk@google.com>
Date: Thu, 24 Jul 2014 17:05:59 -0700
Subject: [PATCH] sdcard: ensure installd fs upgrade has completed

Before running the sdcard daemon, make sure that installd has
completed all upgrades to /data that it needs to complete.
This avoids race conditions between installd and the sdcard daemon.

Maybe fixes bug 16329437.

(cherrypicked from commit 8d28fa71fce6a5623488614250970ce78551a924)

Bug: 16329437
Change-Id: I5e164f08009c1036469f8734ec07cbae9c5e262b
---
 sdcard/sdcard.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sdcard/sdcard.c b/sdcard/sdcard.c
index 64ca4b342..e41359653 100644
--- a/sdcard/sdcard.c
+++ b/sdcard/sdcard.c
@@ -1850,6 +1850,7 @@ int main(int argc, char **argv)
     bool split_perms = false;
     int i;
     struct rlimit rlim;
+    int fs_version;
 
     int opt;
     while ((opt = getopt(argc, argv, "u:g:w:t:dls")) != -1) {
@@ -1924,6 +1925,11 @@ int main(int argc, char **argv)
         ERROR("Error setting RLIMIT_NOFILE, errno = %d\n", errno);
     }
 
+    while ((fs_read_atomic_int("/data/.layout_version", &fs_version) == -1) || (fs_version < 3)) {
+        ERROR("installd fs upgrade not yet complete. Waiting...\n");
+        sleep(1);
+    }
+
     res = run(source_path, dest_path, uid, gid, write_gid, num_threads, derive, split_perms);
     return res < 0 ? 1 : 0;
 }