From 33771701175fd2343b624798b6fb220d7cbac934 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Tue, 15 Sep 2009 14:44:06 +0300 Subject: [PATCH] --- yaml --- r: 164055 b: refs/heads/master c: d6d140097beb554daa967d3fb576e94ad2f82dcd h: refs/heads/master i: 164053: 918924899cf5fcdba0b0b2380e138d62f3bbefc3 164051: 6b055de86e0f6cffcc802ff18dcd8b2aefbf7258 164047: 25b7cd46dda5050349776e0c6e957529470bef29 v: v3 --- [refs] | 2 +- trunk/fs/ubifs/ubifs-media.h | 7 +++++++ trunk/fs/ubifs/ubifs.h | 10 ++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ee01d6aa3bbe..4e983066966c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 873a64c762f0c52cdf95dcee59bd416bbf9688e6 +refs/heads/master: d6d140097beb554daa967d3fb576e94ad2f82dcd diff --git a/trunk/fs/ubifs/ubifs-media.h b/trunk/fs/ubifs/ubifs-media.h index 3eee07e0c495..191ca7863fe7 100644 --- a/trunk/fs/ubifs/ubifs-media.h +++ b/trunk/fs/ubifs/ubifs-media.h @@ -135,6 +135,13 @@ /* The key is always at the same position in all keyed nodes */ #define UBIFS_KEY_OFFSET offsetof(struct ubifs_ino_node, key) +/* Garbage collector journal head number */ +#define UBIFS_GC_HEAD 0 +/* Base journal head number */ +#define UBIFS_BASE_HEAD 1 +/* Data journal head number */ +#define UBIFS_DATA_HEAD 2 + /* * LEB Properties Tree node types. * diff --git a/trunk/fs/ubifs/ubifs.h b/trunk/fs/ubifs/ubifs.h index 9782e7cf8f2b..8ca441f5c7ea 100644 --- a/trunk/fs/ubifs/ubifs.h +++ b/trunk/fs/ubifs/ubifs.h @@ -105,12 +105,10 @@ /* Number of non-data journal heads */ #define NONDATA_JHEADS_CNT 2 -/* Garbage collector head */ -#define GCHD 0 -/* Base journal head number */ -#define BASEHD 1 -/* First "general purpose" journal head */ -#define DATAHD 2 +/* Shorter names for journal head numbers for internal usage */ +#define GCHD UBIFS_GC_HEAD +#define BASEHD UBIFS_BASE_HEAD +#define DATAHD UBIFS_DATA_HEAD /* 'No change' value for 'ubifs_change_lp()' */ #define LPROPS_NC 0x80000001