diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 18:57:56 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-03 18:57:56 -0800 |
| commit | f25e7804729d25bcfde575b78b501e06a8cbb708 (patch) | |
| tree | d98e3220a7522671e6ce82a2d40bf878dfa3eccc /mkfs/f2fs_format_utils.h | |
| parent | 5668a2234ad79ffd45838679692d10236a3e965f (diff) | |
| parent | 4f5a66a6eb77baa896d3adfb12139a830573f609 (diff) | |
| download | android_external_f2fs-tools-stable/cm-11.0-XNF9X.tar.gz android_external_f2fs-tools-stable/cm-11.0-XNF9X.tar.bz2 android_external_f2fs-tools-stable/cm-11.0-XNF9X.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0
Conflicts:
Android.mk
VERSION
fsck/dump.c
fsck/f2fs.h
fsck/fsck.c
fsck/main.c
fsck/mount.c
include/f2fs_fs.h
include/f2fs_version.h
lib/libf2fs.c
mkfs/Makefile.am
mkfs/f2fs_format.c
mkfs/f2fs_format_utils.c
mkfs/f2fs_format_utils.h
tools/f2fstat.c
tools/fibmap.c
Change-Id: I5cc044a6fe47bac6cab8d845f8d63729f765de50
Diffstat (limited to 'mkfs/f2fs_format_utils.h')
| -rw-r--r-- | mkfs/f2fs_format_utils.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mkfs/f2fs_format_utils.h b/mkfs/f2fs_format_utils.h index 3ba0fd6..9f531ee 100644 --- a/mkfs/f2fs_format_utils.h +++ b/mkfs/f2fs_format_utils.h @@ -4,16 +4,17 @@ * Copyright (c) 2014 Samsung Electronics Co., Ltd. * http://www.samsung.com/ * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * Dual licensed under the GPL or LGPL version 2 licenses. */ #define _LARGEFILE64_SOURCE +#ifndef ANDROID +#include "f2fs_fs.h" +#else #include "include/f2fs_fs.h" -#include "include/f2fs_version.h" +#endif extern struct f2fs_configuration config; -void f2fs_finalize_device(); -int f2fs_trim_device(); +int f2fs_trim_device(void); +int f2fs_format_device(void); |