Changeset c621f4aa in mainline for uspace/srv/fs/fat/fat.h

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline.

File:

• uspace/srv/fs/fat/fat.h (modified) (3 diffs)

uspace/srv/fs/fat/fat.h

@@ -89 +89 @@
                         uint16_t        signature;
                 } __attribute__ ((packed));
-                struct fat32 {
+                struct {
                         /* FAT32 only */
                         /** Sectors per FAT. */
@@ -119 +119 @@
                         /** Signature. */
                         uint16_t        signature;
-                } __attribute__ ((packed));
-        }; 
+                } fat32 __attribute__ ((packed));
+        };
 } __attribute__ ((packed)) fat_bs_t;
 
@@ -194 +194 @@
         /** FAT in-core node free list link. */
         link_t                  ffn_link;
-        size_t                  size;
+        aoff64_t                size;
         unsigned                lnkcnt;
         unsigned                refcnt;