diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-06-03 20:53:59 +0300 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-06-06 18:50:40 +0300 |
| commit | 206c4c4d337fc687bda03e052813f06e7d199a6d (patch) | |
| tree | 661932375a7d2d346c130f7b7529c062ba612552 /fs/ubifs/sb.c | |
| parent | 6475613cb4fb21b628c3e74f8aa188c74416d513 (diff) | |
UBIFS: remove format version 2 support
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs/ubifs/sb.c')
| -rw-r--r-- | fs/ubifs/sb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c index 2c06ffd76d02..a02c2200d0c3 100644 --- a/fs/ubifs/sb.c +++ b/fs/ubifs/sb.c @@ -527,7 +527,7 @@ int ubifs_read_superblock(struct ubifs_info *c) goto out; } - if (c->fmt_version == 1) { + if (c->fmt_version < 3) { ubifs_err("on-flash format version %d is not supported", c->fmt_version); err = -EINVAL; @@ -536,11 +536,7 @@ int ubifs_read_superblock(struct ubifs_info *c) switch (sup->key_hash) { case UBIFS_KEY_HASH_R5: - /* TODO: this should die soon */ - if (c->fmt_version == 2) - c->key_hash = tmp_key_r5_hash; - else - c->key_hash = key_r5_hash; + c->key_hash = key_r5_hash; c->key_hash_type = UBIFS_KEY_HASH_R5; break; |