vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix reiserfs big seek times.

Browse source 
* grub-core/fs/reiserfs.c (grub_reiserfs_get_item): New argument
	exact. All users updated.
	(grub_reiserfs_read): Use nearest btree search for seeking.
	Fix return value on error.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-02 10:30:52 +02:00
parent dc478aeae5
commit bb9a34e88d
2 changed files with 69 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2012-05-02 Vladimir Serbinenko <phcoder@gmail.com>
Fix reiserfs big seek times.
* grub-core/fs/reiserfs.c (grub_reiserfs_get_item): New argument
exact. All users updated.
(grub_reiserfs_read): Use nearest btree search for seeking.
Fix return value on error.
2012-05-02 Vladimir Serbinenko <phcoder@gmail.com> 2012-05-02 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/legacycfg.c (legacy_file): Default to restricted * grub-core/commands/legacycfg.c (legacy_file): Default to restricted

87
grub-core/fs/reiserfs.c
View file

@ -468,7 +468,7 @@ grub_reiserfs_compare_keys (const struct grub_reiserfs_key *key1,
static grub_err_t static grub_err_t
grub_reiserfs_get_item (struct grub_reiserfs_data *data, grub_reiserfs_get_item (struct grub_reiserfs_data *data,
const struct grub_reiserfs_key *key, const struct grub_reiserfs_key *key,
struct grub_fshelp_node *item) struct grub_fshelp_node *item, int exact)
{ {
grub_uint32_t block_number; grub_uint32_t block_number;
struct grub_reiserfs_block_header *block_header = 0; struct grub_reiserfs_block_header *block_header = 0;
@ -581,30 +581,47 @@ grub_reiserfs_get_item (struct grub_reiserfs_data *data,
item_headers item_headers
= (struct grub_reiserfs_item_header *) (block_header + 1); = (struct grub_reiserfs_item_header *) (block_header + 1);
for (i = 0; for (i = 0;
i < item_count i < item_count;
&& (grub_reiserfs_compare_keys (key, &(item_headers[i].key))
!= 0);
i++) i++)
{ {
#ifdef GRUB_REISERFS_DEBUG int val;
if (key->directory_id == item_headers[i].key.directory_id && \ val = grub_reiserfs_compare_keys (key, &(item_headers[i].key));
key->object_id == item_headers[i].key.object_id) if (val == 0)
grub_printf("C"); {
else block_key = &(item_headers[i].key);
grub_printf(" "); break;
grub_printf(" %03d/%03d ", i + 1, item_count); }
grub_reiserfs_print_key (&(item_headers[i].key)); if (val < 0 && exact)
#endif break;
} if (val < 0)
if (i < item_count) {
block_key = &(item_headers[i].key); if (i == 0)
{
grub_error (GRUB_ERR_READ_ERROR, "unexpected btree node");
goto fail;
}
i--;
block_key = &(item_headers[i].key);
break;
}
}
if (!exact && i == item_count)
{
if (i == 0)
{
grub_error (GRUB_ERR_READ_ERROR, "unexpected btree node");
goto fail;
}
i--;
block_key = &(item_headers[i].key);
}
} }
} }
while (current_level > 1); while (current_level > 1);
item->data = data; item->data = data;
if (i == item_count || grub_reiserfs_compare_keys (key, block_key)) if (!block_key)
{ {
item->block_number = 0; item->block_number = 0;
item->block_position = 0; item->block_position = 0;
@ -654,7 +671,7 @@ grub_reiserfs_read_symlink (grub_fshelp_node_t node)
grub_reiserfs_set_key_type (&key, GRUB_REISERFS_DIRECT, grub_reiserfs_set_key_type (&key, GRUB_REISERFS_DIRECT,
grub_reiserfs_get_key_version (&key)); grub_reiserfs_get_key_version (&key));
if (grub_reiserfs_get_item (node->data, &key, &found) != GRUB_ERR_NONE) if (grub_reiserfs_get_item (node->data, &key, &found, 1) != GRUB_ERR_NONE)
goto fail; goto fail;
if (found.block_number == 0) if (found.block_number == 0)
@ -797,7 +814,7 @@ grub_reiserfs_iterate_dir (grub_fshelp_node_t item,
if (! entry_item) if (! entry_item)
goto fail; goto fail;
if (grub_reiserfs_get_item (data, &entry_key, entry_item) if (grub_reiserfs_get_item (data, &entry_key, entry_item, 1)
!= GRUB_ERR_NONE) != GRUB_ERR_NONE)
{ {
grub_free (entry_item); grub_free (entry_item);
@ -816,7 +833,7 @@ grub_reiserfs_iterate_dir (grub_fshelp_node_t item,
grub_reiserfs_set_key_offset (&entry_key, 0); grub_reiserfs_set_key_offset (&entry_key, 0);
grub_reiserfs_set_key_type (&entry_key, GRUB_REISERFS_STAT, grub_reiserfs_set_key_type (&entry_key, GRUB_REISERFS_STAT,
2); 2);
if (grub_reiserfs_get_item (data, &entry_key, entry_item) if (grub_reiserfs_get_item (data, &entry_key, entry_item, 1)
!= GRUB_ERR_NONE) != GRUB_ERR_NONE)
{ {
grub_free (entry_item); grub_free (entry_item);
@ -959,7 +976,7 @@ next:
grub_reiserfs_set_key_offset (&(item_headers[block_position].key), grub_reiserfs_set_key_offset (&(item_headers[block_position].key),
next_offset); next_offset);
if (grub_reiserfs_get_item (data, &(item_headers[block_position].key), if (grub_reiserfs_get_item (data, &(item_headers[block_position].key),
&directory_item) != GRUB_ERR_NONE) &directory_item, 1) != GRUB_ERR_NONE)
goto fail; goto fail;
block_number = directory_item.block_number; block_number = directory_item.block_number;
block_position = directory_item.block_position; block_position = directory_item.block_position;
@ -1001,7 +1018,7 @@ grub_reiserfs_open (struct grub_file *file, const char *name)
key.u.v2.offset_type = 0; key.u.v2.offset_type = 0;
grub_reiserfs_set_key_type (&key, GRUB_REISERFS_DIRECTORY, 2); grub_reiserfs_set_key_type (&key, GRUB_REISERFS_DIRECTORY, 2);
grub_reiserfs_set_key_offset (&key, 1); grub_reiserfs_set_key_offset (&key, 1);
if (grub_reiserfs_get_item (data, &key, &root) != GRUB_ERR_NONE) if (grub_reiserfs_get_item (data, &key, &root, 1) != GRUB_ERR_NONE)
goto fail; goto fail;
if (root.block_number == 0) if (root.block_number == 0)
{ {
@ -1017,7 +1034,7 @@ grub_reiserfs_open (struct grub_file *file, const char *name)
key.object_id = found->header.key.object_id; key.object_id = found->header.key.object_id;
grub_reiserfs_set_key_type (&key, GRUB_REISERFS_STAT, 2); grub_reiserfs_set_key_type (&key, GRUB_REISERFS_STAT, 2);
grub_reiserfs_set_key_offset (&key, 0); grub_reiserfs_set_key_offset (&key, 0);
if (grub_reiserfs_get_item (data, &key, &info) != GRUB_ERR_NONE) if (grub_reiserfs_get_item (data, &key, &info, 1) != GRUB_ERR_NONE)
goto fail; goto fail;
if (info.block_number == 0) if (info.block_number == 0)
{ {
@ -1097,11 +1114,27 @@ grub_reiserfs_read (grub_file_t file, char *buf, grub_size_t len)
(unsigned long long) final_position, (unsigned long long) final_position,
(unsigned long long) (final_position - initial_position), (unsigned long long) (final_position - initial_position),
(unsigned long) len); (unsigned long) len);
grub_reiserfs_set_key_offset (&key, initial_position + 1);
if (grub_reiserfs_get_item (data, &key, &found, 0) != GRUB_ERR_NONE)
goto fail;
if (found.block_number == 0)
{
grub_error (GRUB_ERR_READ_ERROR, "offset %lld not found",
(unsigned long long) initial_position);
goto fail;
}
current_key_offset = grub_reiserfs_get_key_offset (&found.header.key);
current_position = current_key_offset - 1;
while (current_position < final_position) while (current_position < final_position)
{ {
grub_reiserfs_set_key_offset (&key, current_key_offset); grub_reiserfs_set_key_offset (&key, current_key_offset);
if (grub_reiserfs_get_item (data, &key, &found) != GRUB_ERR_NONE) if (grub_reiserfs_get_item (data, &key, &found, 1) != GRUB_ERR_NONE)
goto fail; goto fail;
if (found.block_number == 0) if (found.block_number == 0)
goto fail; goto fail;
@ -1245,7 +1278,7 @@ grub_reiserfs_read (grub_file_t file, char *buf, grub_size_t len)
fail: fail:
grub_free (indirect_block_ptr); grub_free (indirect_block_ptr);
return 0; return -1;
} }
/* Close the file FILE. */ /* Close the file FILE. */
@ -1296,7 +1329,7 @@ grub_reiserfs_dir (grub_device_t device, const char *path,
root_key.u.v2.offset_type = 0; root_key.u.v2.offset_type = 0;
grub_reiserfs_set_key_type (&root_key, GRUB_REISERFS_DIRECTORY, 2); grub_reiserfs_set_key_type (&root_key, GRUB_REISERFS_DIRECTORY, 2);
grub_reiserfs_set_key_offset (&root_key, 1); grub_reiserfs_set_key_offset (&root_key, 1);
if (grub_reiserfs_get_item (data, &root_key, &root) != GRUB_ERR_NONE) if (grub_reiserfs_get_item (data, &root_key, &root, 1) != GRUB_ERR_NONE)
goto fail; goto fail;
if (root.block_number == 0) if (root.block_number == 0)
{ {