summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeun-young Park <keunyoung@google.com>2017-05-04 18:28:15 -0700
committerKeun-young Park <keunyoung@google.com>2017-05-04 21:06:59 -0700
commit886b1b45d5087bff491091856fc3e57ca6f4e82f (patch)
tree73a7c89ff6ca6f1ad5ae339b87422856c4435f65
parent3ffa3067e5e2b1dfe1efc4e4e5e0b94f73a939d5 (diff)
use passed blk dev name for quota / super block check
- It was using blk dev name from fstab and quota / super block check was always failing for FDE bug: 37913441 Test: reboot and confirm quota (cherry picked from commit 951968841145a45c423463e8cd9de592cc264f5f) Change-Id: Id5613387924d3a8d9ed4486113654aed89184af9
-rw-r--r--fs_mgr/fs_mgr.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 247768aeb..abdd4986d 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1047,8 +1047,7 @@ int fs_mgr_do_mount(struct fstab *fstab, const char *n_name, char *n_blk_device,
}
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) {