Changeset 7a57269f in mainline

Timestamp:

2011-04-07T21:00:29Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

88ccd8b8

Parents:

07dcec5

Message:

Fix bug in the read_directory_dentry(), the directory index was ignored

File:

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

uspace/srv/fs/minixfs/mfs_dentry.c

@@ -45 +45 @@
         block_t *b;
 
-        struct mfs_dentry_info *d_info = malloc(sizeof *d_info);
+        struct mfs_dentry_info *d_info = malloc(sizeof(*d_info));
 
         if (!d_info)
@@ -51 +51 @@
 
         int r = read_map(&block, mnode, index * sbi->dirsize);
-
         if (r != EOK || block == 0)
                 goto out_err;
 
         r = block_get(&b, inst->handle, block, BLOCK_FLAGS_NONE);
-
         if (r != EOK)
                 goto out_err;
+
+        unsigned dentries_per_zone = sbi->block_size / sbi->dirsize;
+        unsigned dentry_off = index % (dentries_per_zone - 1);
 
         if (sbi->fs_version == MFS_VERSION_V3) {
@@ -64 +65 @@
 
                 d3 = b->data;
+                d3 += dentry_off;
                 d_info->d_inum = conv32(sbi->native, d3->d_inum);
                 memcpy(d_info->d_name, d3->d_name, MFS3_MAX_NAME_LEN);
@@ -73 +75 @@
 
                 d = b->data;
+                d += dentry_off;
                 d_info->d_inum = conv16(sbi->native, d->d_inum);
                 memcpy(d_info->d_name, d->d_name, namelen);