Changeset e666ddc in mainline for uspace/srv/fs/minixfs/mfs_dentry.c

Timestamp:

2011-04-09T15:35:40Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

668f1949

Parents:

e33100c

Message:

Fix a bug in dentry on-disk offset calculation

File:

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

uspace/srv/fs/minixfs/mfs_dentry.c

@@ -45 +45 @@
         block_t *b;
 
+        mfsdebug("read_directory(%u)\n", index);
+
         struct mfs_dentry_info *d_info = malloc(sizeof(*d_info));
-
         if (!d_info)
                 return NULL;
@@ -64 +65 @@
                 struct mfs3_dentry *d3;
 
-                d3 = b->data;
+                d3 = b->data + (dentry_off * MFS3_DIRSIZE);
                 d3 += dentry_off;
                 d_info->d_inum = conv32(sbi->native, d3->d_inum);
@@ -74 +75 @@
                 struct mfs_dentry *d;
 
-                d = b->data;
-                d += dentry_off;
+                d = b->data + dentry_off * (longnames ? MFSL_DIRSIZE :
+                                                        MFS_DIRSIZE);
                 d_info->d_inum = conv16(sbi->native, d->d_inum);
                 memcpy(d_info->d_name, d->d_name, namelen);