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.cpp | |
| 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.cpp')
| -rw-r--r-- | libsparse/backed_block.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libsparse/backed_block.cpp b/libsparse/backed_block.cpp index f3d8022ac..6229e7c6e 100644 --- a/libsparse/backed_block.cpp +++ b/libsparse/backed_block.cpp @@ -25,7 +25,7 @@ struct backed_block { unsigned int block; - unsigned int len; + uint64_t len; enum backed_block_type type; union { struct { @@ -60,7 +60,7 @@ struct backed_block* backed_block_iter_next(struct backed_block* bb) { return bb->next; } -unsigned int backed_block_len(struct backed_block* bb) { +uint64_t backed_block_len(struct backed_block* bb) { return bb->len; } @@ -270,7 +270,7 @@ static int queue_bb(struct backed_block_list* bbl, struct backed_block* new_bb) } /* Queues a fill block of memory to be written to the specified data blocks */ -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) { struct backed_block* bb = reinterpret_cast<backed_block*>(calloc(1, sizeof(struct backed_block))); if (bb == nullptr) { @@ -287,7 +287,7 @@ int backed_block_add_fill(struct backed_block_list* bbl, unsigned int fill_val, } /* Queues a block of memory to be written to the specified data blocks */ -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) { struct backed_block* bb = reinterpret_cast<backed_block*>(calloc(1, sizeof(struct backed_block))); if (bb == nullptr) { @@ -305,7 +305,7 @@ int backed_block_add_data(struct backed_block_list* bbl, void* data, unsigned in /* Queues a chunk of a file on disk to be written to the specified data blocks */ int backed_block_add_file(struct backed_block_list* bbl, const char* filename, int64_t offset, - unsigned int len, unsigned int block) { + uint64_t len, unsigned int block) { struct backed_block* bb = reinterpret_cast<backed_block*>(calloc(1, sizeof(struct backed_block))); if (bb == nullptr) { return -ENOMEM; @@ -322,7 +322,7 @@ int backed_block_add_file(struct backed_block_list* bbl, const char* filename, i } /* Queues a chunk of a fd to be written to the specified data blocks */ -int backed_block_add_fd(struct backed_block_list* bbl, int fd, int64_t offset, unsigned int len, +int backed_block_add_fd(struct backed_block_list* bbl, int fd, int64_t offset, uint64_t len, unsigned int block) { struct backed_block* bb = reinterpret_cast<backed_block*>(calloc(1, sizeof(struct backed_block))); if (bb == nullptr) { |