From ae6dbab2d7ce88ae0b098c0f893d8825e2f3db6c Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Wed, 29 Feb 2012 18:43:01 +0200 Subject: [PATCH] --- yaml --- r: 294653 b: refs/heads/master c: 7ca58bad6904c721678cf2171dc78b97cc03d500 h: refs/heads/master i: 294651: f5a162d1b2903edf92f7374ff6874e79c54e7bf0 v: v3 --- [refs] | 2 +- trunk/fs/ubifs/ubifs.h | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 252f6274c5b9..640d7f3d659c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c43be1085f8480ab36d5c8c76a08e67bdf6d2e18 +refs/heads/master: 7ca58bad6904c721678cf2171dc78b97cc03d500 diff --git a/trunk/fs/ubifs/ubifs.h b/trunk/fs/ubifs/ubifs.h index 12e94774aa88..93d59aceaaef 100644 --- a/trunk/fs/ubifs/ubifs.h +++ b/trunk/fs/ubifs/ubifs.h @@ -84,9 +84,6 @@ #define INUM_WARN_WATERMARK 0xFFF00000 #define INUM_WATERMARK 0xFFFFFF00 -/* Largest key size supported in this implementation */ -#define CUR_MAX_KEY_LEN UBIFS_SK_LEN - /* Maximum number of entries in each LPT (LEB category) heap */ #define LPT_HEAP_SZ 256 @@ -277,10 +274,10 @@ struct ubifs_old_idx { /* The below union makes it easier to deal with keys */ union ubifs_key { - uint8_t u8[CUR_MAX_KEY_LEN]; - uint32_t u32[CUR_MAX_KEY_LEN/4]; - uint64_t u64[CUR_MAX_KEY_LEN/8]; - __le32 j32[CUR_MAX_KEY_LEN/4]; + uint8_t u8[UBIFS_SK_LEN]; + uint32_t u32[UBIFS_SK_LEN/4]; + uint64_t u64[UBIFS_SK_LEN/8]; + __le32 j32[UBIFS_SK_LEN/4]; }; /**