diff options
author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /libsparse/backed_block.h | |
parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'libsparse/backed_block.h')
-rw-r--r-- | libsparse/backed_block.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libsparse/backed_block.h b/libsparse/backed_block.h index 3a7546065..71a89698e 100644 --- a/libsparse/backed_block.h +++ b/libsparse/backed_block.h @@ -29,18 +29,18 @@ enum backed_block_type { BACKED_BLOCK_FILL, }; -int backed_block_add_data(struct backed_block_list* bbl, void* data, unsigned int len, +int backed_block_add_data(struct backed_block_list* bbl, void* data, uint64_t len, unsigned int block); -int backed_block_add_fill(struct backed_block_list* bbl, unsigned int fill_val, unsigned int len, +int backed_block_add_fill(struct backed_block_list* bbl, unsigned int fill_val, uint64_t len, unsigned int block); int backed_block_add_file(struct backed_block_list* bbl, const char* filename, int64_t offset, - unsigned int len, unsigned int block); -int backed_block_add_fd(struct backed_block_list* bbl, int fd, int64_t offset, unsigned int len, + uint64_t len, unsigned int block); +int backed_block_add_fd(struct backed_block_list* bbl, int fd, int64_t offset, uint64_t len, unsigned int block); struct backed_block* backed_block_iter_new(struct backed_block_list* bbl); struct backed_block* backed_block_iter_next(struct backed_block* bb); -unsigned int backed_block_len(struct backed_block* bb); +uint64_t backed_block_len(struct backed_block* bb); unsigned int backed_block_block(struct backed_block* bb); void* backed_block_data(struct backed_block* bb); const char* backed_block_filename(struct backed_block* bb); |