Merge branch 'master' of git://git.denx.de/u-boot-ti

[karo-tx-uboot.git] / fs / ext2 / ext2fs.c

diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c
index 513a2f9e3201fb78f9c068f9277ee134ba98ad18..a88cf8704180261dc17559ca69d2ca3abbcbd203 100644 (file)
--- a/fs/ext2/ext2fs.c
+++ b/fs/ext2/ext2fs.c
@@ -24,8 +24,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_CMD_EXT2)
 #include <ext2fs.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
@@ -112,7 +110,7 @@ struct ext2_block_group {
        uint32_t inode_table_id;
        uint16_t free_blocks;
        uint16_t free_inodes;
-       uint16_t pad;
+       uint16_t used_dir_cnt;
        uint32_t reserved[3];
 };
 
@@ -180,18 +178,27 @@ int indir1_blkno = -1;
 uint32_t *indir2_block = NULL;
 int indir2_size = 0;
 int indir2_blkno = -1;
+static unsigned int inode_size;
 
 
 static int ext2fs_blockgroup
        (struct ext2_data *data, int group, struct ext2_block_group *blkgrp) {
+       unsigned int blkno;
+       unsigned int blkoff;
+       unsigned int desc_per_blk;
+
+       desc_per_blk = EXT2_BLOCK_SIZE(data) / sizeof(struct ext2_block_group);
+
+       blkno = __le32_to_cpu(data->sblock.first_data_block) + 1 +
+       group / desc_per_blk;
+       blkoff = (group % desc_per_blk) * sizeof(struct ext2_block_group);
 #ifdef DEBUG
-       printf ("ext2fs read blockgroup\n");
+       printf ("ext2fs read %d group descriptor (blkno %d blkoff %d)\n",
+               group, blkno, blkoff);
 #endif
-       return (ext2fs_devread
-               (((__le32_to_cpu (data->sblock.first_data_block) +
-                  1) << LOG2_EXT2_BLOCK_SIZE (data)),
-                group * sizeof (struct ext2_block_group),
-                sizeof (struct ext2_block_group), (char *) blkgrp));
+       return (ext2fs_devread (blkno << LOG2_EXT2_BLOCK_SIZE(data),
+               blkoff, sizeof(struct ext2_block_group), (char *)blkgrp));
+
 }
 
 
@@ -205,34 +212,33 @@ static int ext2fs_read_inode
        unsigned int blkno;
        unsigned int blkoff;
 
-       /* It is easier to calculate if the first inode is 0.  */
-       ino--;
 #ifdef DEBUG
-       printf ("ext2fs read inode %d\n", ino);
+       printf ("ext2fs read inode %d, inode_size %d\n", ino, inode_size);
 #endif
-       status = ext2fs_blockgroup (data,
-                                   ino /
-                                   __le32_to_cpu (sblock->inodes_per_group),
-                                   &blkgrp);
+       /* It is easier to calculate if the first inode is 0.  */
+       ino--;
+       status = ext2fs_blockgroup (data, ino / __le32_to_cpu
+                                   (sblock->inodes_per_group), &blkgrp);
        if (status == 0) {
                return (0);
        }
-       inodes_per_block = EXT2_BLOCK_SIZE (data) / 128;
-       blkno = (ino % __le32_to_cpu (sblock->inodes_per_group)) /
-               inodes_per_block;
-       blkoff = (ino % __le32_to_cpu (sblock->inodes_per_group)) %
-               inodes_per_block;
+
+       inodes_per_block = EXT2_BLOCK_SIZE(data) / inode_size;
+
+       blkno = __le32_to_cpu (blkgrp.inode_table_id) +
+               (ino % __le32_to_cpu (sblock->inodes_per_group))
+               / inodes_per_block;
+       blkoff = (ino % inodes_per_block) * inode_size;
 #ifdef DEBUG
        printf ("ext2fs read inode blkno %d blkoff %d\n", blkno, blkoff);
 #endif
        /* Read the inode.  */
-       status = ext2fs_devread (((__le32_to_cpu (blkgrp.inode_table_id) +
-                                  blkno) << LOG2_EXT2_BLOCK_SIZE (data)),
-                                sizeof (struct ext2_inode) * blkoff,
+       status = ext2fs_devread (blkno << LOG2_EXT2_BLOCK_SIZE (data), blkoff,
                                 sizeof (struct ext2_inode), (char *) inode);
        if (status == 0) {
                return (0);
        }
+
        return (1);
 }
 
@@ -358,7 +364,7 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) {
                        indir2_size = blksz;
                }
                if ((__le32_to_cpu (indir1_block[rblock / perblock]) <<
-                    log2_blksz) != indir1_blkno) {
+                    log2_blksz) != indir2_blkno) {
                        status = ext2fs_devread (__le32_to_cpu(indir1_block[rblock / perblock]) << log2_blksz,
                                                 0, blksz,
                                                 (char *) indir2_block);
@@ -436,7 +442,7 @@ int ext2fs_read_file
                                return (-1);
                        }
                } else {
-                       memset (buf, blocksize - skipfirst, 0);
+                       memset (buf, 0, blocksize - skipfirst);
                }
                buf += blocksize - skipfirst;
        }
@@ -854,6 +860,15 @@ int ext2fs_mount (unsigned part_length) {
        if (__le16_to_cpu (data->sblock.magic) != EXT2_MAGIC) {
                goto fail;
        }
+       if (__le32_to_cpu(data->sblock.revision_level == 0)) {
+               inode_size = 128;
+       } else {
+               inode_size = __le16_to_cpu(data->sblock.inode_size);
+       }
+#ifdef DEBUG
+       printf("EXT2 rev %d, inode_size %d\n",
+                       __le32_to_cpu(data->sblock.revision_level), inode_size);
+#endif
        data->diropen.data = data;
        data->diropen.ino = 2;
        data->diropen.inode_read = 1;
@@ -874,5 +889,3 @@ fail:
        ext2fs_root = NULL;
        return (0);
 }
-
-#endif