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

* stage2/fsys_reiserfs.c (read_tree_node): Fixed a typo; only

Browse source 
matters for very large fs when tree doesn't fit in cache.
(IH_KEY_OFFSET): Don't check for INFO->version.  There are
actually old version file systems that use new version items.
(IH_KEY_ISTYPE): Likewise.
(reiserfs_dir): Likewise.
This commit is contained in:
jochen 2003-08-12 10:20:27 +00:00
parent 6194afc326
commit 7c7f8f73ea
2 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2003-06-17 Jochen Hoenicke <jochen@gnu.org>
* stage2/fsys_reiserfs.c (read_tree_node): Fixed a typo; only
matters for very large fs when tree doesn't fit in cache.
(IH_KEY_OFFSET): Don't check for INFO->version. There are
actually old version file systems that use new version items.
(IH_KEY_ISTYPE): Likewise.
(reiserfs_dir): Likewise.
2003-08-09 Thierry Laronde <tlaronde@polynum.org> 2003-08-09 Thierry Laronde <tlaronde@polynum.org>
* util/mkbimage: NEW File. `mkbimage' depends on GRUB and existed * util/mkbimage: NEW File. `mkbimage' depends on GRUB and existed

27
stage2/fsys_reiserfs.c
View file

@ -213,13 +213,11 @@ struct item_head
#define ITEM_VERSION_1 0 #define ITEM_VERSION_1 0
#define ITEM_VERSION_2 1 #define ITEM_VERSION_2 1
#define IH_KEY_OFFSET(ih) (INFO->version < 2 \ #define IH_KEY_OFFSET(ih) ((ih)->ih_version == ITEM_VERSION_1 \
|| (ih)->ih_version == ITEM_VERSION_1 \
? (ih)->ih_key.u.v1.k_offset \ ? (ih)->ih_key.u.v1.k_offset \
: (ih)->ih_key.u.v2.k_offset) : (ih)->ih_key.u.v2.k_offset)
#define IH_KEY_ISTYPE(ih, type) (INFO->version < 2 \ #define IH_KEY_ISTYPE(ih, type) ((ih)->ih_version == ITEM_VERSION_1 \
|| (ih)->ih_version == ITEM_VERSION_1 \
? (ih)->ih_key.u.v1.k_uniqueness == V1_##type \ ? (ih)->ih_key.u.v1.k_uniqueness == V1_##type \
: (ih)->ih_key.u.v2.k_type == V2_##type) : (ih)->ih_key.u.v2.k_type == V2_##type)
@ -613,6 +611,11 @@ reiserfs_mount (void)
INFO->cached_slots = INFO->cached_slots =
(FSYSREISER_CACHE_SIZE >> INFO->fullblocksize_shift) - 1; (FSYSREISER_CACHE_SIZE >> INFO->fullblocksize_shift) - 1;
#ifdef REISERDEBUG
printf ("reiserfs_mount: version=%d, blocksize=%d\n",
INFO->version, INFO->blocksize);
#endif /* REISERDEBUG */
/* Clear node cache. */ /* Clear node cache. */
memset (INFO->blocks, 0, sizeof (INFO->blocks)); memset (INFO->blocks, 0, sizeof (INFO->blocks));
@ -738,7 +741,8 @@ next_key (void)
{ {
depth = DISK_LEAF_NODE_LEVEL; depth = DISK_LEAF_NODE_LEVEL;
/* The last item, was the last in the leaf node. /* The last item, was the last in the leaf node.
* Read in the next block */ * Read in the next block
*/
do do
{ {
if (depth == INFO->tree_depth) if (depth == INFO->tree_depth)
@ -761,7 +765,7 @@ next_key (void)
cache = CACHE (depth); cache = CACHE (depth);
else else
{ {
cache = read_tree_node (INFO->blocks[depth], --depth); cache = read_tree_node (INFO->blocks[depth], depth);
if (! cache) if (! cache)
return 0; return 0;
} }
@ -911,6 +915,10 @@ reiserfs_read (char *buf, int len)
if (IH_KEY_ISTYPE(INFO->current_ih, TYPE_DIRECT) if (IH_KEY_ISTYPE(INFO->current_ih, TYPE_DIRECT)
&& offset < blocksize) && offset < blocksize)
{ {
#ifdef REISERDEBUG
printf ("direct_read: offset=%d, blocksize=%d\n",
offset, blocksize);
#endif /* REISERDEBUG */
to_read = blocksize - offset; to_read = blocksize - offset;
if (to_read > len) if (to_read > len)
to_read = len; to_read = len;
@ -931,6 +939,10 @@ reiserfs_read (char *buf, int len)
else if (IH_KEY_ISTYPE(INFO->current_ih, TYPE_INDIRECT)) else if (IH_KEY_ISTYPE(INFO->current_ih, TYPE_INDIRECT))
{ {
blocksize = (blocksize >> 2) << INFO->fullblocksize_shift; blocksize = (blocksize >> 2) << INFO->fullblocksize_shift;
#ifdef REISERDEBUG
printf ("indirect_read: offset=%d, blocksize=%d\n",
offset, blocksize);
#endif /* REISERDEBUG */
while (offset < blocksize) while (offset < blocksize)
{ {
@ -1087,8 +1099,7 @@ reiserfs_dir (char *dirname)
/* If this is a new stat data and size is > 4GB set filemax to /* If this is a new stat data and size is > 4GB set filemax to
* maximum * maximum
*/ */
if (INFO->version >= 2 if (INFO->current_ih->ih_version == ITEM_VERSION_2
&& INFO->current_ih->ih_version == ITEM_VERSION_2
&& ((struct stat_data *) INFO->current_item)->sd_size_hi > 0) && ((struct stat_data *) INFO->current_item)->sd_size_hi > 0)
filemax = 0xffffffff; filemax = 0xffffffff;