commit 0069b01354ab9a62acaf4547f78688429274f0ef
author jp abgrall <jpa@google.com> Mon Nov 12 15:58:57 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 12 15:58:57 2012 -0800
tree c36520a2464d1e86dd2d96f67aceb0301b45e168
parent 1626b98c5b1d4755f0f146698d487732dcc0a2cc
parent 3ddc0059bb897c4d7d2e0c6d9812d590388480d1

am 3ddc0059: am ee854b07: Merge "Allocate a UID for clatd"

* commit '3ddc0059bb897c4d7d2e0c6d9812d590388480d1':
  Allocate a UID for clatd

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