summaryrefslogtreecommitdiff
path: root/ext4_utils/make_ext4fs.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2013-01-23 15:38:57 -0800
committerColin Cross <ccross@android.com>2013-01-23 17:00:13 -0800
commit965298695c981ee5a67e86977a8e40a50f7392ab (patch)
tree52c260f635da2f3bdaa57edeb0b091360ad7f82a /ext4_utils/make_ext4fs.c
parent03ad99cff5743b9e0ce462f53dd2f0fcb17b169b (diff)
downloadextras-965298695c981ee5a67e86977a8e40a50f7392ab.tar.gz
ext4_utils: reduce exported apis
Remove unnecessary functions from make_ext4fs.h so they are not exposed to users of libext4_utils. Requires fixing up some internal places that depended on the definitions in the external make_ext4fs.h header. Change-Id: Ied24e0efb648d4fd2ccdd1a5a1b685e9bde9cfd7
Diffstat (limited to 'ext4_utils/make_ext4fs.c')
-rw-r--r--ext4_utils/make_ext4fs.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index 57179125..e69b473a 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -59,6 +59,10 @@
#else
+#include <selinux/selinux.h>
+#include <selinux/label.h>
+#include <selinux/android.h>
+
#define O_BINARY 0
#endif
@@ -353,7 +357,7 @@ void reset_ext4fs_info() {
}
}
-int make_ext4fs_sparse_fd(int fd, s64 len,
+int make_ext4fs_sparse_fd(int fd, long long len,
const char *mountpoint, struct selabel_handle *sehnd)
{
reset_ext4fs_info();
@@ -362,7 +366,7 @@ int make_ext4fs_sparse_fd(int fd, s64 len,
return make_ext4fs_internal(fd, NULL, mountpoint, NULL, 0, 1, 0, 0, 0, sehnd);
}
-int make_ext4fs(const char *filename, s64 len,
+int make_ext4fs(const char *filename, long long len,
const char *mountpoint, struct selabel_handle *sehnd)
{
int fd;