commit 512e9525ecd8a47ddae47a12e6f8a70f8b0abfd1
author Mark Salyzyn <salyzyn@google.com> Thu Mar 13 21:34:37 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 13 21:34:37 2014 +0000
tree 4c03c05c9fef614233159fb579b77308390515e0
parent d9e5827140a5ba9af8de04f0f923c0a2585a6659
parent 18a5432158ad43b8faefe4950b30e760200ce0b4

Merge changes I1572338c,I39965007

* changes:
  logd: liblog: logcat: Add LogWhiteBlackList
  logd: prune by worst offending UID

fs_mgr/fs_mgr.c

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index 0a0a08a..c4f27a0 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -260,9 +260,9 @@
 
         /* back up errno as partition_wipe clobbers the value */
         mount_errno = errno;
-
         /* mount(2) returned an error, check if it's encryptable and deal with it */
-        if ((fstab->recs[i].fs_mgr_flags & MF_CRYPT) &&
+        if (mount_errno != EBUSY && mount_errno != EACCES &&
+            (fstab->recs[i].fs_mgr_flags & MF_CRYPT) &&
             !partition_wiped(fstab->recs[i].blk_device)) {
             /* Need to mount a tmpfs at this mountpoint for now, and set
              * properties that vold will query later for decrypting