Changeset e33100c in mainline

Timestamp:

2011-04-09T12:58:38Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e666ddc

Parents:

534d08e8

Message:

The root inode (index == 1) is at offset 0 in the inode table.

Location:

uspace

Files:

• app/mkminix/mkminix.c (modified) (3 diffs)
• srv/fs/minixfs/mfs_inode.c (modified) (2 diffs)

uspace/app/mkminix/mkminix.c

@@ -366 +366 @@
         memset(ino_buf, 0x00, MFS_BLOCKSIZE);
 
-        ino_buf[MFS_ROOT_INO].i_mode = S_IFDIR;
-        ino_buf[MFS_ROOT_INO].i_uid = 0;
-        ino_buf[MFS_ROOT_INO].i_gid = 0;
-        ino_buf[MFS_ROOT_INO].i_size = (sb->longnames ? MFSL_DIRSIZE : MFS_DIRSIZE) * 2;
-        ino_buf[MFS_ROOT_INO].i_mtime = sec;
-        ino_buf[MFS_ROOT_INO].i_nlinks = 2;
-        ino_buf[MFS_ROOT_INO].i_dzone[0] = sb->first_data_zone;
+        ino_buf[MFS_ROOT_INO - 1].i_mode = S_IFDIR;
+        ino_buf[MFS_ROOT_INO - 1].i_uid = 0;
+        ino_buf[MFS_ROOT_INO - 1].i_gid = 0;
+        ino_buf[MFS_ROOT_INO - 1].i_size = (sb->longnames ? MFSL_DIRSIZE :
+                                                MFS_DIRSIZE) * 2;
+        ino_buf[MFS_ROOT_INO - 1].i_mtime = sec;
+        ino_buf[MFS_ROOT_INO - 1].i_nlinks = 2;
+        ino_buf[MFS_ROOT_INO - 1].i_dzone[0] = sb->first_data_zone;
 
         rc = write_block(itable_off, 1, ino_buf);
@@ -398 +399 @@
         memset(ino_buf, 0x00, sb->block_size);
 
-        ino_buf[MFS_ROOT_INO].i_mode = S_IFDIR;
-        ino_buf[MFS_ROOT_INO].i_uid = 0;
-        ino_buf[MFS_ROOT_INO].i_gid = 0;
-        ino_buf[MFS_ROOT_INO].i_size = MFS3_DIRSIZE * 2;
-        ino_buf[MFS_ROOT_INO].i_mtime = sec;
-        ino_buf[MFS_ROOT_INO].i_atime = sec;
-        ino_buf[MFS_ROOT_INO].i_ctime = sec;
-        ino_buf[MFS_ROOT_INO].i_nlinks = 2;
-        ino_buf[MFS_ROOT_INO].i_dzone[0] = sb->first_data_zone;
+        ino_buf[MFS_ROOT_INO - 1].i_mode = S_IFDIR;
+        ino_buf[MFS_ROOT_INO - 1].i_uid = 0;
+        ino_buf[MFS_ROOT_INO - 1].i_gid = 0;
+        ino_buf[MFS_ROOT_INO - 1].i_size = MFS3_DIRSIZE * 2;
+        ino_buf[MFS_ROOT_INO - 1].i_mtime = sec;
+        ino_buf[MFS_ROOT_INO - 1].i_atime = sec;
+        ino_buf[MFS_ROOT_INO - 1].i_ctime = sec;
+        ino_buf[MFS_ROOT_INO - 1].i_nlinks = 2;
+        ino_buf[MFS_ROOT_INO - 1].i_dzone[0] = sb->first_data_zone;
 
         rc = write_block(itable_off, 1, ino_buf);
@@ -564 +565 @@
         memset(zbmap_buf, 0xFF, zbmap_nblocks * sb->block_size);
 
-        for (i = 2; i < sb->n_inodes; ++i)
+        for (i = 2; i < sb->n_inodes + 1; ++i)
                 mark_bmap(ibmap_buf, i, FREE);
 

uspace/srv/fs/minixfs/mfs_inode.c

@@ -82 +82 @@
         sbi = instance->sbi;
         assert(sbi);
-        
+
+        /*inode 0 does not exist*/
+        inum -= 1;
+
         const int ino_off = inum % sbi->ino_per_block;
         const size_t ino_size = sizeof(struct mfs_inode);
@@ -146 +149 @@
         sbi = instance->sbi;
         assert(sbi);
+
+        /*inode 0 does not exist*/
+        inum -= 1;
 
         const int itable_off = sbi->itable_off;