summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2013-01-23 21:20:39 -0800
committerColin Cross <ccross@android.com>2013-01-23 21:20:39 -0800
commitfd2608e2e5e684e6e2cc0bf794aa66e1f1373b1e (patch)
tree669a769d80829f445463d0b43ea010f59746511d
parentce89579c0cca93a441293d4f13b9f6a7beb7b72f (diff)
parentebe2ff59b5a14c5102b71000f24f06e9c6ee8fd7 (diff)
downloadextras-fd2608e2e5e684e6e2cc0bf794aa66e1f1373b1e.tar.gz
Merge commit 'ebe2ff59' into master
-rw-r--r--ext4_utils/make_ext4fs.c9
-rw-r--r--ext4_utils/make_ext4fs.h2
2 files changed, 11 insertions, 0 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index 64fcc84b..57179125 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -353,6 +353,15 @@ void reset_ext4fs_info() {
}
}
+int make_ext4fs_sparse_fd(int fd, s64 len,
+ const char *mountpoint, struct selabel_handle *sehnd)
+{
+ reset_ext4fs_info();
+ info.len = len;
+
+ return make_ext4fs_internal(fd, NULL, mountpoint, NULL, 0, 1, 0, 0, 0, sehnd);
+}
+
int make_ext4fs(const char *filename, s64 len,
const char *mountpoint, struct selabel_handle *sehnd)
{
diff --git a/ext4_utils/make_ext4fs.h b/ext4_utils/make_ext4fs.h
index e80e6367..d75ea02a 100644
--- a/ext4_utils/make_ext4fs.h
+++ b/ext4_utils/make_ext4fs.h
@@ -38,6 +38,8 @@ typedef void (*fs_config_func_t)(const char *path, int dir, unsigned *uid, unsig
void reset_ext4fs_info();
int make_ext4fs(const char *filename, s64 len,
const char *mountpoint, struct selabel_handle *sehnd);
+int make_ext4fs_sparse_fd(int fd, s64 len,
+ const char *mountpoint, struct selabel_handle *sehnd);
int make_ext4fs_internal(int fd, const char *directory,
const char *mountpoint, fs_config_func_t fs_config_func, int gzip,
int sparse, int crc, int wipe, int init_itabs,