diff options
| author | Colin Cross <ccross@android.com> | 2014-01-23 14:21:40 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-01-23 14:24:16 -0800 |
| commit | a8be6279350211d610d2cf30173bd4bcb6405dfb (patch) | |
| tree | c48e7d40e519a857ad01b5582d9e7fdd329536b6 /fs_mgr | |
| parent | 1db584b899dffca884c3842c07da189f7c9af470 (diff) | |
| download | core-a8be6279350211d610d2cf30173bd4bcb6405dfb.tar.gz core-a8be6279350211d610d2cf30173bd4bcb6405dfb.tar.bz2 core-a8be6279350211d610d2cf30173bd4bcb6405dfb.zip | |
fs_mgr: update ext4_parse_sb to match change in ext4_utils
ext4_parse_sb now takes the struct fs_info to fill out to avoid
using the global info from external callers.
Change-Id: I0984ba01c0dbdd5b68b825817faf0c5cf5aa5510
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr_verity.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs_mgr/fs_mgr_verity.c b/fs_mgr/fs_mgr_verity.c index 154931684..40bc2ecde 100644 --- a/fs_mgr/fs_mgr_verity.c +++ b/fs_mgr/fs_mgr_verity.c @@ -36,8 +36,7 @@ #include "mincrypt/sha.h" #include "mincrypt/sha256.h" -#include "ext4_utils.h" -#include "ext4.h" +#include "ext4_sb.h" #include "fs_mgr_priv.h" #include "fs_mgr_priv_verity.h" @@ -122,6 +121,7 @@ static int get_target_device_size(char *blk_device, uint64_t *device_size) { int data_device; struct ext4_super_block sb; + struct fs_info info = {0}; data_device = open(blk_device, O_RDONLY); if (data_device < 0) { @@ -141,7 +141,7 @@ static int get_target_device_size(char *blk_device, uint64_t *device_size) return -1; } - ext4_parse_sb(&sb); + ext4_parse_sb(&sb, &info); *device_size = info.len; close(data_device); |