openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Colin Cross 2014-01-23 14:21:40 -08:00
parent 1db584b899
commit a8be627935
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs_mgr/fs_mgr_verity.c
View File

@ -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);