diff options
author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-02-29 11:43:01 -0500 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-02-29 11:43:01 -0500 |
commit | 7ca58bad6904c721678cf2171dc78b97cc03d500 (patch) | |
tree | 6458ff0fe593c768860a3088b9d96937bad7d3be /fs/ubifs | |
parent | c43be1085f8480ab36d5c8c76a08e67bdf6d2e18 (diff) |
UBIFS: kill CUR_MAX_KEY_LEN macro
It is useless and confusing and may make people believe they may just
change it, which is not true, because this will also change the on-flash
format.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'fs/ubifs')
-rw-r--r-- | fs/ubifs/ubifs.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 12e94774aa88..93d59aceaaef 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h | |||
@@ -84,9 +84,6 @@ | |||
84 | #define INUM_WARN_WATERMARK 0xFFF00000 | 84 | #define INUM_WARN_WATERMARK 0xFFF00000 |
85 | #define INUM_WATERMARK 0xFFFFFF00 | 85 | #define INUM_WATERMARK 0xFFFFFF00 |
86 | 86 | ||
87 | /* Largest key size supported in this implementation */ | ||
88 | #define CUR_MAX_KEY_LEN UBIFS_SK_LEN | ||
89 | |||
90 | /* Maximum number of entries in each LPT (LEB category) heap */ | 87 | /* Maximum number of entries in each LPT (LEB category) heap */ |
91 | #define LPT_HEAP_SZ 256 | 88 | #define LPT_HEAP_SZ 256 |
92 | 89 | ||
@@ -277,10 +274,10 @@ struct ubifs_old_idx { | |||
277 | 274 | ||
278 | /* The below union makes it easier to deal with keys */ | 275 | /* The below union makes it easier to deal with keys */ |
279 | union ubifs_key { | 276 | union ubifs_key { |
280 | uint8_t u8[CUR_MAX_KEY_LEN]; | 277 | uint8_t u8[UBIFS_SK_LEN]; |
281 | uint32_t u32[CUR_MAX_KEY_LEN/4]; | 278 | uint32_t u32[UBIFS_SK_LEN/4]; |
282 | uint64_t u64[CUR_MAX_KEY_LEN/8]; | 279 | uint64_t u64[UBIFS_SK_LEN/8]; |
283 | __le32 j32[CUR_MAX_KEY_LEN/4]; | 280 | __le32 j32[UBIFS_SK_LEN/4]; |
284 | }; | 281 | }; |
285 | 282 | ||
286 | /** | 283 | /** |