commit 27888a5ded21182e1f15b19010fd2527fb7e1ef0
author Kenny Root <kroot@android.com> Tue Nov 27 11:55:13 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 27 11:55:13 2012 -0800
tree 2aee26e02e344f2926e609fa8f40b14c595bf26f
parent 0069b01354ab9a62acaf4547f78688429274f0ef
parent 9b82ce20ebca3eb5bf782c38ca36d8acbb2ffae6

am 9b82ce20: Merge "Document the SELinux extensions to the Android init language."

* commit '9b82ce20ebca3eb5bf782c38ca36d8acbb2ffae6':
  Document the SELinux extensions to the Android init language.

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 */