pupa-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Small compile fix for ext2.c


From: Jeroen Dekkers
Subject: Small compile fix for ext2.c
Date: Thu, 30 Oct 2003 22:44:28 +0100
User-agent: Mutt/1.5.4i

This fixes a small compile error in ext2.c.

2003-10-30  Jeroen Dekkers  <address@hidden>

        * fs/ext2.c (struct pupa_ext2_inode): Declare struct datablocks
        as blocks.
        (pupa_ext2_get_file_block): Use blocks member.

Index: fs/ext2.c
===================================================================
RCS file: /cvsroot/pupa/pupa/fs/ext2.c,v
retrieving revision 1.1
diff -u -p -r1.1 ext2.c
--- fs/ext2.c   29 Oct 2003 18:44:27 -0000      1.1
+++ fs/ext2.c   30 Oct 2003 21:15:28 -0000
@@ -125,7 +125,7 @@ struct pupa_ext2_inode
       pupa_uint32_t indir_block;
       pupa_uint32_t double_indir_block;
       pupa_uint32_t tripple_indir_block;
-    };
+    } blocks;
     char symlink[60];
   };
   pupa_uint32_t version;
@@ -181,13 +181,14 @@ pupa_ext2_get_file_block (struct pupa_ex
 
   /* Direct blocks.  */
   if (fileblock < INDIRECT_BLOCKS)
-    blknr = pupa_le_to_cpu32 (inode->dir_blocks[fileblock]);
+    blknr = pupa_le_to_cpu32 (inode->blocks.dir_blocks[fileblock]);
   /* Indirect.  */
   else if (fileblock < INDIRECT_BLOCKS + EXT2_BLOCK_SIZE (data) / 4)
     {
       pupa_uint32_t indir[EXT2_BLOCK_SIZE (data) / 4];
 
-      if (pupa_disk_read (data->disk, pupa_le_to_cpu32 (inode->indir_block)
+      if (pupa_disk_read (data->disk, 
+                         pupa_le_to_cpu32 (inode->blocks.indir_block)
                          << LOG2_EXT2_BLOCK_SIZE (data),
                          0, EXT2_BLOCK_SIZE (data), (char *) indir))
        return pupa_errno;
@@ -204,7 +205,7 @@ pupa_ext2_get_file_block (struct pupa_ex
       pupa_uint32_t indir[EXT2_BLOCK_SIZE (data) / 4];
 
       if (pupa_disk_read (data->disk, 
-                         pupa_le_to_cpu32 (inode->double_indir_block) 
+                         pupa_le_to_cpu32 (inode->blocks.double_indir_block) 
                          << LOG2_EXT2_BLOCK_SIZE (data),
                          0, EXT2_BLOCK_SIZE (data), (char *) indir))
        return pupa_errno;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]