Changeset 1494e52 in mainline

Timestamp:

2011-04-19T20:56:44Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

e5cebc9

Parents:

127d999

Message:

Fix dentry in-block offset calculation.

File:

• uspace/srv/fs/minixfs/mfs_dentry.c (modified) (3 diffs)

uspace/srv/fs/minixfs/mfs_dentry.c

@@ -67 +67 @@
 
         unsigned dentries_per_zone = sbi->block_size / sbi->dirsize;
-        unsigned dentry_off = index % (dentries_per_zone - 1);
+        unsigned dentry_off = index % dentries_per_zone;
 
         if (sbi->fs_version == MFS_VERSION_V3) {
@@ -177 +177 @@
 
         if (!empty_dentry_found) {
+                mfsdebug("inode grow\n");
                 r = inode_grow(mnode, sbi->dirsize);
                 if (r != EOK)
                         return r;
 
+                mfsdebug("read dentry\n");
                 r = read_directory_entry(mnode, &d_info, i);
                 if (r != EOK)
                         return r;
+
+                assert(d_info != NULL);
         }
 
@@ -191 +195 @@
 
         r = write_dentry(d_info);
+        mfsdebug("write inode\n");
         free(d_info);