diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-09-15 14:44:06 +0300 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-09-15 14:45:35 +0300 |
| commit | d6d140097beb554daa967d3fb576e94ad2f82dcd (patch) | |
| tree | b29f202923cd194f92cf896c3431509dddd26fee | |
| parent | 873a64c762f0c52cdf95dcee59bd416bbf9688e6 (diff) | |
| download | linux-d6d140097beb554daa967d3fb576e94ad2f82dcd.tar.gz linux-d6d140097beb554daa967d3fb576e94ad2f82dcd.tar.bz2 linux-d6d140097beb554daa967d3fb576e94ad2f82dcd.zip | |
UBIFS: define journal head numbers in ubifs-media.h
The journal head names and numbers are part of the UBIFS format, so
they should be in the ubifs-media.h.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
| -rw-r--r-- | fs/ubifs/ubifs-media.h | 7 | ||||
| -rw-r--r-- | fs/ubifs/ubifs.h | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/fs/ubifs/ubifs-media.h b/fs/ubifs/ubifs-media.h index 3eee07e0c495..191ca7863fe7 100644 --- a/fs/ubifs/ubifs-media.h +++ b/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/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 9782e7cf8f2b..8ca441f5c7ea 100644 --- a/fs/ubifs/ubifs.h +++ b/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 |