diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 21:40:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 21:40:25 -0400 |
| commit | 462cee296476278acaa54c41925b3273e0e4dd40 (patch) | |
| tree | c9d9fcfc4dd62807cb67678a6eda0151bfa8be95 /fs/reiserfs/super.c | |
| parent | 126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c (diff) | |
| parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'fs/reiserfs/super.c')
| -rw-r--r-- | fs/reiserfs/super.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 |