diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-25 09:38:26 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-25 09:38:26 +0100 |
| commit | c1c58ada91cfe86f19d430282132434e620a1067 (patch) | |
| tree | cd12933040a65398e9779c3596f5109e37c206c3 /fs | |
| parent | 67394f8f069c2fdf90f3b6d851824c07815442af (diff) | |
| parent | 2a24ab628aa7b190be32f63dfb6d96f3fb61580a (diff) | |
| download | op-kernel-dev-c1c58ada91cfe86f19d430282132434e620a1067.zip op-kernel-dev-c1c58ada91cfe86f19d430282132434e620a1067.tar.gz | |
Merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'fs')
| -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 da23ba7..c47f8fd 100644 --- a/fs/reiserfs/stree.c +++ b/fs/reiserfs/stree.c @@ -230,7 +230,6 @@ const struct reiserfs_key MAX_KEY = { __constant_cpu_to_le32(0xffffffff)},} }; -const struct in_core_key MAX_IN_CORE_KEY = {~0U, ~0U, ~0ULL>>4, 15}; /* Get delimiting key of the buffer by looking for it in the buffers in the path, starting from the bottom 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 31e7512..b35b877 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c @@ -164,7 +164,9 @@ static int finish_unfinished (struct super_block * s) /* compose key to look for "save" links */ max_cpu_key.version = KEY_FORMAT_3_5; - max_cpu_key.on_disk_key = MAX_IN_CORE_KEY; + max_cpu_key.on_disk_key.k_dir_id = ~0U; + max_cpu_key.on_disk_key.k_objectid = ~0U; + set_cpu_key_k_offset (&max_cpu_key, ~0U); max_cpu_key.key_length = 3; #ifdef CONFIG_QUOTA |
