[Ocfs2-tools-devel] [PATCH 3/7] mkfs.ocfs2: Rename ocfs2_fs_types to ocfs2_mkfs_types
Sunil Mushran
sunil.mushran at oracle.com
Wed Feb 17 12:42:25 PST 2010
Patch renames ocfs2_fs_types to ocfs2_mkfs_types because it is now part
of libocfs2.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
---
include/ocfs2/ocfs2.h | 12 ++++++------
libocfs2/feature_string.c | 17 +++++++++--------
mkfs.ocfs2/mkfs.c | 44 ++++++++++++++++++++++----------------------
mkfs.ocfs2/mkfs.h | 2 +-
4 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/include/ocfs2/ocfs2.h b/include/ocfs2/ocfs2.h
index c5f0064..b9da66c 100644
--- a/include/ocfs2/ocfs2.h
+++ b/include/ocfs2/ocfs2.h
@@ -239,11 +239,11 @@ struct _ocfs2_fs_options {
uint32_t opt_ro_compat;
};
-enum ocfs2_fs_types {
- FS_DEFAULT,
- FS_DATAFILES,
- FS_MAIL,
- FS_VMSTORE,
+enum ocfs2_mkfs_types {
+ OCFS2_MKFSTYPE_DEFAULT,
+ OCFS2_MKFSTYPE_DATAFILES,
+ OCFS2_MKFSTYPE_MAIL,
+ OCFS2_MKFSTYPE_VMSTORE,
};
struct _ocfs2_quota_hash {
@@ -906,7 +906,7 @@ errcode_t ocfs2_parse_feature_level(const char *typestr,
enum ocfs2_feature_levels *level);
errcode_t ocfs2_merge_feature_flags_with_level(ocfs2_fs_options *dest,
- enum ocfs2_fs_types fstype,
+ enum ocfs2_mkfs_types fstype,
int level,
ocfs2_fs_options *feature_set,
ocfs2_fs_options *reverse_set);
diff --git a/libocfs2/feature_string.c b/libocfs2/feature_string.c
index 30a34b1..79d5712 100644
--- a/libocfs2/feature_string.c
+++ b/libocfs2/feature_string.c
@@ -94,28 +94,28 @@ static ocfs2_fs_options feature_level_defaults[] = {
OCFS2_FEATURE_RO_COMPAT_GRPQUOTA }, /* OCFS2_FEATURE_LEVEL_MAX_FEATURES */
};
-static ocfs2_fs_options fstypes_features_defaults[] = {
+static ocfs2_fs_options mkfstypes_features_defaults[] = {
{OCFS2_FEATURE_COMPAT_BACKUP_SB | OCFS2_FEATURE_COMPAT_JBD2_SB,
OCFS2_FEATURE_INCOMPAT_SPARSE_ALLOC |
OCFS2_FEATURE_INCOMPAT_INLINE_DATA,
- OCFS2_FEATURE_RO_COMPAT_UNWRITTEN}, /* FS_DEFAULT */
+ OCFS2_FEATURE_RO_COMPAT_UNWRITTEN}, /* OCFS2_MKFSTYPE_DEFAULT */
{OCFS2_FEATURE_COMPAT_BACKUP_SB | OCFS2_FEATURE_COMPAT_JBD2_SB,
OCFS2_FEATURE_INCOMPAT_SPARSE_ALLOC |
OCFS2_FEATURE_INCOMPAT_INLINE_DATA,
- OCFS2_FEATURE_RO_COMPAT_UNWRITTEN}, /* FS_DATAFILES */
+ OCFS2_FEATURE_RO_COMPAT_UNWRITTEN}, /* OCFS2_MKFSTYPE_DATAFILES */
{OCFS2_FEATURE_COMPAT_BACKUP_SB | OCFS2_FEATURE_COMPAT_JBD2_SB,
OCFS2_FEATURE_INCOMPAT_SPARSE_ALLOC |
OCFS2_FEATURE_INCOMPAT_INLINE_DATA,
- OCFS2_FEATURE_RO_COMPAT_UNWRITTEN}, /* FS_MAIL */
+ OCFS2_FEATURE_RO_COMPAT_UNWRITTEN}, /* OCFS2_MKFSTYPE_MAIL */
{OCFS2_FEATURE_COMPAT_BACKUP_SB | OCFS2_FEATURE_COMPAT_JBD2_SB,
OCFS2_FEATURE_INCOMPAT_SPARSE_ALLOC |
OCFS2_FEATURE_INCOMPAT_INLINE_DATA |
OCFS2_FEATURE_INCOMPAT_XATTR |
OCFS2_FEATURE_INCOMPAT_REFCOUNT_TREE,
- OCFS2_FEATURE_RO_COMPAT_UNWRITTEN}, /* FS_VMSTORE */
+ OCFS2_FEATURE_RO_COMPAT_UNWRITTEN}, /* OCFS2_MKFSTYPE_VMSTORE */
};
/* These are the features we support in mkfs/tunefs via --fs-features */
@@ -575,7 +575,7 @@ static void ocfs2_feature_clear_deps(ocfs2_fs_options *reverse_set)
* reverse_set: all the features a user want to clear by "--fs-features".
*/
errcode_t ocfs2_merge_feature_flags_with_level(ocfs2_fs_options *dest,
- enum ocfs2_fs_types fstype,
+ enum ocfs2_mkfs_types fstype,
int level,
ocfs2_fs_options *feature_set,
ocfs2_fs_options *reverse_set)
@@ -583,7 +583,7 @@ errcode_t ocfs2_merge_feature_flags_with_level(ocfs2_fs_options *dest,
ocfs2_fs_options level_set;
if (level == OCFS2_FEATURE_LEVEL_DEFAULT)
- level_set = fstypes_features_defaults[fstype];
+ level_set = mkfstypes_features_defaults[fstype];
else
level_set = feature_level_defaults[level];
@@ -948,7 +948,8 @@ int main(int argc, char *argv[])
}
memset(&mkfs_features, 0, sizeof(ocfs2_fs_options));
- err = ocfs2_merge_feature_flags_with_level(&mkfs_features, FS_DEFAULT,
+ err = ocfs2_merge_feature_flags_with_level(&mkfs_features,
+ OCFS2_MKFSTYPE_DEFAULT,
level,
&set_features,
&clear_features);
diff --git a/mkfs.ocfs2/mkfs.c b/mkfs.ocfs2/mkfs.c
index 585643a..85e5463 100644
--- a/mkfs.ocfs2/mkfs.c
+++ b/mkfs.ocfs2/mkfs.c
@@ -112,14 +112,14 @@ static SystemFileInfo system_files[] = {
struct fs_type_translation {
const char *ft_str;
- enum ocfs2_fs_types ft_type;
+ enum ocfs2_mkfs_types ft_type;
};
-static struct fs_type_translation ocfs2_fs_types_table[] = {
- {"datafiles", FS_DATAFILES},
- {"mail", FS_MAIL},
- {"vmstore", FS_VMSTORE},
- {NULL, FS_DEFAULT},
+static struct fs_type_translation ocfs2_mkfs_types_table[] = {
+ {"datafiles", OCFS2_MKFSTYPE_DATAFILES},
+ {"mail", OCFS2_MKFSTYPE_MAIL},
+ {"vmstore", OCFS2_MKFSTYPE_VMSTORE},
+ {NULL, OCFS2_MKFSTYPE_DEFAULT},
};
enum {
@@ -708,20 +708,20 @@ main(int argc, char **argv)
static void
parse_fs_type_opts(char *progname, const char *typestr,
- enum ocfs2_fs_types *fs_type)
+ enum ocfs2_mkfs_types *fs_type)
{
int i;
- *fs_type = FS_DEFAULT;
+ *fs_type = OCFS2_MKFSTYPE_DEFAULT;
- for(i = 0; ocfs2_fs_types_table[i].ft_str; i++) {
- if (strcmp(typestr, ocfs2_fs_types_table[i].ft_str) == 0) {
- *fs_type = ocfs2_fs_types_table[i].ft_type;
+ for(i = 0; ocfs2_mkfs_types_table[i].ft_str; i++) {
+ if (strcmp(typestr, ocfs2_mkfs_types_table[i].ft_str) == 0) {
+ *fs_type = ocfs2_mkfs_types_table[i].ft_type;
break;
}
}
- if (*fs_type == FS_DEFAULT) {
+ if (*fs_type == OCFS2_MKFSTYPE_DEFAULT) {
com_err(progname, 0, "Bad fs type option specified.");
exit(1);
}
@@ -747,7 +747,7 @@ get_state(int argc, char **argv)
uint64_t val;
uint64_t journal_size_in_bytes = 0;
int journal64 = 0;
- enum ocfs2_fs_types fs_type = FS_DEFAULT;
+ enum ocfs2_mkfs_types fs_type = OCFS2_MKFSTYPE_DEFAULT;
int mount = -1;
int no_backup_super = -1;
enum ocfs2_feature_levels level = OCFS2_FEATURE_LEVEL_DEFAULT;
@@ -1283,13 +1283,13 @@ static uint64_t figure_journal_size(uint64_t size, State *s)
}
switch (s->fs_type) {
- case FS_DATAFILES:
+ case OCFS2_MKFSTYPE_DATAFILES:
j_blocks = journal_size_datafiles();
break;
- case FS_MAIL:
+ case OCFS2_MKFSTYPE_MAIL:
j_blocks = journal_size_mail(s);
break;
- case FS_VMSTORE:
+ case OCFS2_MKFSTYPE_VMSTORE:
j_blocks = journal_size_vmstore(s);
break;
default:
@@ -1479,8 +1479,8 @@ fill_defaults(State *s)
if (!s->cluster_size) {
switch (s->fs_type) {
- case FS_DATAFILES:
- case FS_VMSTORE:
+ case OCFS2_MKFSTYPE_DATAFILES:
+ case OCFS2_MKFSTYPE_VMSTORE:
s->cluster_size = cluster_size_datafiles(s);
break;
default:
@@ -2601,11 +2601,11 @@ print_state(State *s)
if (s->quiet)
return;
- if (s->fs_type != FS_DEFAULT) {
- for(i = 0; ocfs2_fs_types_table[i].ft_str; i++) {
- if (ocfs2_fs_types_table[i].ft_type == s->fs_type) {
+ if (s->fs_type != OCFS2_MKFSTYPE_DEFAULT) {
+ for(i = 0; ocfs2_mkfs_types_table[i].ft_str; i++) {
+ if (ocfs2_mkfs_types_table[i].ft_type == s->fs_type) {
printf("Filesystem Type of %s\n",
- ocfs2_fs_types_table[i].ft_str);
+ ocfs2_mkfs_types_table[i].ft_str);
break;
}
}
diff --git a/mkfs.ocfs2/mkfs.h b/mkfs.ocfs2/mkfs.h
index 644f4c2..5049e9f 100644
--- a/mkfs.ocfs2/mkfs.h
+++ b/mkfs.ocfs2/mkfs.h
@@ -230,7 +230,7 @@ struct _State {
ocfs2_fs_options feature_flags;
- enum ocfs2_fs_types fs_type;
+ enum ocfs2_mkfs_types fs_type;
};
int ocfs2_fill_cluster_information(State *s);
--
1.6.3.3
More information about the Ocfs2-tools-devel
mailing list