commit fe22485e67486437879c5b286d27279af1654d4f
author Keun-young Park <keunyoung@google.com> Fri May 05 03:47:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 05 03:47:34 2017 +0000
tree 8be59546915ff4a59d28f4fa40490f547b280463
parent b18720577603d0492ba39bd2337a78f135cf9aaa
parent e5b4089904b8092641a09c261888ae872aeda4a9

Merge "use passed blk dev name for quota / super block check" am: 7b706c5b9e am: 2f3718c472
am: d31f3a0e9b

Change-Id: I0031690605466dcf7600c162565be5f6d6fd44cf

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 6e9069e..60ce43e 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1046,8 +1046,7 @@
         }
 
         int fs_stat = 0;
-        int force_check = do_quota_with_shutdown_check(fstab->recs[i].blk_device,
-                                                       fstab->recs[i].fs_type,
+        int force_check = do_quota_with_shutdown_check(n_blk_device, fstab->recs[i].fs_type,
                                                        &fstab->recs[i], &fs_stat);
 
         if ((fstab->recs[i].fs_mgr_flags & MF_CHECK) || force_check) {