Changeset be39fc6 in mainline for uspace/lib/ext4/include

Timestamp:

2017-05-11T22:26:39Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

de5b708

Parents:

4bfad34

Message:

Adjust prefixes ext4fs → ext4 after moving code.

Location:

uspace/lib/ext4/include/ext4

Files:

• filesystem.h (modified) (1 diff)
• fstypes.h (moved) (moved from uspace/lib/ext4/include/ext4/libext4.h ) (2 diffs)
• ops.h (modified) (1 diff)

uspace/lib/ext4/include/ext4/filesystem.h

@@ -39 +39 @@
 #include "ext4/types.h"
 
-extern int ext4_filesystem_init(ext4_filesystem_t *, ext4fs_instance_t *,
+extern int ext4_filesystem_init(ext4_filesystem_t *, ext4_instance_t *,
     service_id_t, enum cache_mode, aoff64_t *);
 extern int ext4_filesystem_fini(ext4_filesystem_t *);

uspace/lib/ext4/include/ext4/fstypes.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2011 Martin Sucha
  * Copyright (c) 2012 Frantisek Princ
  * All rights reserved.
@@ -31 +32 @@
  */
 
-#ifndef LIBEXT4_H_
-#define LIBEXT4_H_
+#ifndef LIBEXT4_FSTYPES_H_
+#define LIBEXT4_FSTYPES_H_
 
-#include "ext4/balloc.h"
-#include "ext4/bitmap.h"
-#include "ext4/block_group.h"
-#include "ext4/directory.h"
-#include "ext4/directory_index.h"
-#include "ext4/extent.h"
-#include "ext4/filesystem.h"
-#include "ext4/hash.h"
-#include "ext4/ialloc.h"
-#include "ext4/inode.h"
-#include "ext4/superblock.h"
+#include <adt/list.h>
+#include <libfs.h>
+#include <loc.h>
 #include "ext4/types.h"
 
-#include <stdio.h>
-#define EXT4FS_DBG(format, ...) \
-        printf("ext4fs: %s: " format "\n", \
-            __FUNCTION__, ##__VA_ARGS__) \
+/**
+ * Type for holding an instance of mounted partition.
+ */
+typedef struct ext4_instance {
+        link_t link;
+        service_id_t service_id;
+        ext4_filesystem_t *filesystem;
+        unsigned int open_nodes_count;
+} ext4_instance_t;
+
+/**
+ * Type for wrapping common fs_node and add some useful pointers.
+ */
+typedef struct ext4_node {
+        ext4_instance_t *instance;
+        ext4_inode_ref_t *inode_ref;
+        fs_node_t *fs_node;
+        ht_link_t link;
+        unsigned int references;
+} ext4_node_t;
+
+#define EXT4_NODE(node) \
+        ((node) ? (ext4_node_t *) (node)->data : NULL)
 
 #endif

uspace/lib/ext4/include/ext4/ops.h

@@ -37 +37 @@
 #include "ext4/fstypes.h"
 
-extern vfs_out_ops_t ext4fs_ops;
-extern libfs_ops_t ext4fs_libfs_ops;
+extern vfs_out_ops_t ext4_ops;
+extern libfs_ops_t ext4_libfs_ops;
 
-extern int ext4fs_global_init(void);
-extern int ext4fs_global_fini(void);
+extern int ext4_global_init(void);
+extern int ext4_global_fini(void);
 
-extern int ext4fs_node_get_core(fs_node_t **, ext4fs_instance_t *, fs_index_t);
-extern int ext4fs_node_put(fs_node_t *);
+extern int ext4_node_get_core(fs_node_t **, ext4_instance_t *, fs_index_t);
+extern int ext4_node_put(fs_node_t *);