Changeset beb9336 in mainline for uspace/lib/ext4/libext4_inode.h

Timestamp:

2012-08-24T14:07:52Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

041ab64

Parents:

bd29f9c9 (diff), db81577 (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/lib/ext4/libext4_inode.h (modified) (3 diffs)

uspace/lib/ext4/libext4_inode.h

@@ -29 +29 @@
 /** @addtogroup libext4
  * @{
- */ 
+ */
 
 #ifndef LIBEXT4_LIBEXT4_INODE_H_
 #define LIBEXT4_LIBEXT4_INODE_H_
 
-#include <libblock.h>
+#include <block.h>
 #include <sys/types.h>
 #include "libext4_types.h"
@@ -56 +56 @@
 extern uint16_t ext4_inode_get_links_count(ext4_inode_t *);
 extern void ext4_inode_set_links_count(ext4_inode_t *, uint16_t);
-extern uint64_t ext4_inode_get_blocks_count(ext4_superblock_t *, ext4_inode_t *);
-extern int ext4_inode_set_blocks_count(ext4_superblock_t *, ext4_inode_t *, uint64_t);
+extern uint64_t ext4_inode_get_blocks_count(ext4_superblock_t *,
+    ext4_inode_t *);
+extern int ext4_inode_set_blocks_count(ext4_superblock_t *, ext4_inode_t *,
+    uint64_t);
 extern uint32_t ext4_inode_get_flags(ext4_inode_t *);
 extern void ext4_inode_set_flags(ext4_inode_t *, uint32_t);
@@ -63 +65 @@
 extern void ext4_inode_set_generation(ext4_inode_t *, uint32_t);
 extern uint64_t ext4_inode_get_file_acl(ext4_inode_t *, ext4_superblock_t *);
-extern void ext4_inode_set_file_acl(ext4_inode_t *, ext4_superblock_t *, uint64_t);
-/*
-uint16_t extra_isize;
-uint32_t ctime_extra; // Extra change time (nsec << 2 | epoch)
-uint32_t mtime_extra; // Extra Modification time (nsec << 2 | epoch)
-uint32_t atime_extra; // Extra Access time (nsec << 2 | epoch)
-uint32_t crtime; // File creation time
-uint32_t crtime_extra; // Extra file creation time (nsec << 2 | epoch)
-uint32_t version_hi;   // High 32 bits for 64-bit version
-*/
-
-/******************************************/
+extern void ext4_inode_set_file_acl(ext4_inode_t *, ext4_superblock_t *,
+    uint64_t);
 
 extern uint32_t ext4_inode_get_direct_block(ext4_inode_t *, uint32_t);