fs_mgr: fixup 'size' attributes of fstab.
'off64_t' is the correct way to specify a size of a file system, so we
update the various fs_mgr fstab attributes accordingly.
Test: boot
Change-Id: I07ebe687b7c215a8d07ce49d6d32e81b798d1cd3
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 6310238..907bdb1 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -20,6 +20,7 @@
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
+#include <inttypes.h>
#include <libgen.h>
#include <stdio.h>
#include <stdlib.h>
@@ -1410,7 +1411,7 @@
ret = -1;
continue;
}
- fprintf(zram_fp.get(), "%u\n", fstab->recs[i].zram_size);
+ fprintf(zram_fp.get(), "%" PRId64 "\n", fstab->recs[i].zram_size);
}
if (fstab->recs[i].fs_mgr_flags & MF_WAIT &&
diff --git a/fs_mgr/fs_mgr_fstab.cpp b/fs_mgr/fs_mgr_fstab.cpp
index e89c91c..410bf6b 100644
--- a/fs_mgr/fs_mgr_fstab.cpp
+++ b/fs_mgr/fs_mgr_fstab.cpp
@@ -42,17 +42,17 @@
char* key_dir;
char *verity_loc;
char *sysfs_path;
- long long part_length;
+ off64_t part_length;
char *label;
int partnum;
int swap_prio;
int max_comp_streams;
- unsigned int zram_size;
- uint64_t reserved_size;
+ off64_t zram_size;
+ off64_t reserved_size;
unsigned int file_contents_mode;
unsigned int file_names_mode;
- unsigned int erase_blk_size;
- unsigned int logical_blk_size;
+ off64_t erase_blk_size;
+ off64_t logical_blk_size;
};
struct flag_list {
@@ -160,9 +160,8 @@
return nullptr;
}
-static uint64_t calculate_zram_size(unsigned int percentage)
-{
- uint64_t total;
+static off64_t calculate_zram_size(unsigned int percentage) {
+ off64_t total;
total = sysconf(_SC_PHYS_PAGES);
total *= percentage;
@@ -173,10 +172,9 @@
return total;
}
-static uint64_t parse_size(const char *arg)
-{
+static off64_t parse_size(const char* arg) {
char *endptr;
- uint64_t size = strtoull(arg, &endptr, 10);
+ off64_t size = strtoll(arg, &endptr, 10);
if (*endptr == 'k' || *endptr == 'K')
size *= 1024LL;
else if (*endptr == 'm' || *endptr == 'M')
@@ -339,7 +337,7 @@
* erase block size. Get it, check that it is a power of 2 and
* at least 4096, and return it.
*/
- auto val = strtoul(arg, NULL, 0);
+ auto val = strtoll(arg, nullptr, 0);
if (val >= 4096 && (val & (val - 1)) == 0)
flag_vals->erase_blk_size = val;
} else if (flag == MF_LOGICALBLKSIZE) {
@@ -347,7 +345,7 @@
* logical block size. Get it, check that it is a power of 2 and
* at least 4096, and return it.
*/
- auto val = strtoul(arg, NULL, 0);
+ auto val = strtoll(arg, nullptr, 0);
if (val >= 4096 && (val & (val - 1)) == 0)
flag_vals->logical_blk_size = val;
} else if (flag == MF_SYSFS) {
diff --git a/fs_mgr/include_fstab/fstab/fstab.h b/fs_mgr/include_fstab/fstab/fstab.h
index bb40511..ca52a98 100644
--- a/fs_mgr/include_fstab/fstab/fstab.h
+++ b/fs_mgr/include_fstab/fstab/fstab.h
@@ -21,6 +21,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
+#include <sys/types.h>
#include <set>
#include <string>
@@ -46,17 +47,17 @@
char* key_loc;
char* key_dir;
char* verity_loc;
- long long length;
+ off64_t length;
char* label;
int partnum;
int swap_prio;
int max_comp_streams;
- unsigned int zram_size;
- uint64_t reserved_size;
- unsigned int file_contents_mode;
- unsigned int file_names_mode;
- unsigned int erase_blk_size;
- unsigned int logical_blk_size;
+ off64_t zram_size;
+ off64_t reserved_size;
+ off64_t file_contents_mode;
+ off64_t file_names_mode;
+ off64_t erase_blk_size;
+ off64_t logical_blk_size;
char* sysfs_path;
};