commit 34ee8252caa1ede3b1ba41b49673c90e3a500459
author Kenny Root <kroot@google.com> Tue Nov 27 11:55:16 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 27 11:55:16 2012 -0800
tree 15679f23ea1eb35acf2510c7284e3767405cbb0f
parent 27888a5ded21182e1f15b19010fd2527fb7e1ef0
parent a649fafbe8a83e9b86ea99f89b6554d93eb1937c

am a649fafb: Merge "Switch keystore to binder"

* commit 'a649fafbe8a83e9b86ea99f89b6554d93eb1937c':
  Switch keystore to binder

fs_mgr/fs_mgr.c

diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c
index 2bcc9c4..e51c9cf 100644
--- a/fs_mgr/fs_mgr.c
+++ b/fs_mgr/fs_mgr.c
@@ -523,11 +523,11 @@
         /* We found our match */
         /* First check the filesystem if requested */
         if (fstab[i].fs_mgr_flags & MF_WAIT) {
-            wait_for_file(fstab[i].blk_dev, WAIT_TIMEOUT);
+            wait_for_file(n_blk_dev, WAIT_TIMEOUT);
         }
 
         if (fstab[i].fs_mgr_flags & MF_CHECK) {
-            check_fs(fstab[i].blk_dev, fstab[i].type, fstab[i].mnt_point);
+            check_fs(n_blk_dev, fstab[i].type, fstab[i].mnt_point);
         }
 
         /* Now mount it where requested */