diff options
author | Vladimir Saveliev <vs@namesys.com> | 2005-05-21 19:33:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-21 19:45:24 -0400 |
commit | f359b74c80bc76c1f6c2cb8f2837882f2335ba0c (patch) | |
tree | b1f1814337146dc0eb45620825ffe583c6303f59 | |
parent | 1808caffaf448f0ad42ba04b25825fc170cf8e44 (diff) |
[PATCH] reiserfs: max_key fix
This patch fixes a bug introduced by Al Viro's patch: [patch 136/174]
reiserfs endianness: clone struct reiserfs_key
The problem is MAX_KEY and MAX_IN_CORE_KEY defined in this patch do not
look equal from reiserfs comp_key's point of view. This caused reiserfs'
sanity check to complain.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/reiserfs/stree.c | 1 | ||||
-rw-r--r-- | fs/reiserfs/super.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c index da23ba75f3d5..c47f8fd31a2d 100644 --- a/fs/reiserfs/stree.c +++ b/fs/reiserfs/stree.c | |||
@@ -230,7 +230,6 @@ const struct reiserfs_key MAX_KEY = { | |||
230 | __constant_cpu_to_le32(0xffffffff)},} | 230 | __constant_cpu_to_le32(0xffffffff)},} |
231 | }; | 231 | }; |
232 | 232 | ||
233 | const struct in_core_key MAX_IN_CORE_KEY = {~0U, ~0U, ~0ULL>>4, 15}; | ||
234 | 233 | ||
235 | /* Get delimiting key of the buffer by looking for it in the buffers in the path, starting from the bottom | 234 | /* Get delimiting key of the buffer by looking for it in the buffers in the path, starting from the bottom |
236 | of the path, and going upwards. We must check the path's validity at each step. If the key is not in | 235 | of the path, and going upwards. We must check the path's validity at each step. If the key is not in |
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 31e75125f48b..b35b87744983 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
@@ -164,7 +164,9 @@ static int finish_unfinished (struct super_block * s) | |||
164 | 164 | ||
165 | /* compose key to look for "save" links */ | 165 | /* compose key to look for "save" links */ |
166 | max_cpu_key.version = KEY_FORMAT_3_5; | 166 | max_cpu_key.version = KEY_FORMAT_3_5; |
167 | max_cpu_key.on_disk_key = MAX_IN_CORE_KEY; | 167 | max_cpu_key.on_disk_key.k_dir_id = ~0U; |
168 | max_cpu_key.on_disk_key.k_objectid = ~0U; | ||
169 | set_cpu_key_k_offset (&max_cpu_key, ~0U); | ||
168 | max_cpu_key.key_length = 3; | 170 | max_cpu_key.key_length = 3; |
169 | 171 | ||
170 | #ifdef CONFIG_QUOTA | 172 | #ifdef CONFIG_QUOTA |