Changeset b7068da in mainline for uspace/srv/fs/mfs/mfs.h

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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 mainline changes

File:

• uspace/srv/fs/mfs/mfs.h (modified) (12 diffs)

uspace/srv/fs/mfs/mfs.h

@@ -48 +48 @@
 #define NAME            "mfs"
 
-//#define DEBUG_MODE
+/* #define DEBUG_MODE */
 
 #define min(a, b)       ((a) < (b) ? (a) : (b))
@@ -71 +71 @@
 } mfs_version_t;
 
-/*Generic MinixFS superblock*/
+/* Generic MinixFS superblock */
 struct mfs_sb_info {
         uint32_t ninodes;
@@ -84 +84 @@
         uint16_t state;
 
-        /*The following fields do not exist on disk but only in memory*/
+        /* The following fields do not exist on disk but only in memory */
         unsigned long itable_size;
         mfs_version_t fs_version;
@@ -97 +97 @@
 };
 
-/*Generic MinixFS inode*/
+/* Generic MinixFS inode */
 struct mfs_ino_info {
         uint16_t        i_mode;
@@ -107 +107 @@
         int32_t         i_mtime;
         int32_t         i_ctime;
-        /*Block numbers for direct zones*/
+        /* Block numbers for direct zones */
         uint32_t        i_dzone[V2_NR_DIRECT_ZONES];
-        /*Block numbers for indirect zones*/
+        /* Block numbers for indirect zones */
         uint32_t        i_izone[V2_NR_INDIRECT_ZONES];
 
-        /*The following fields do not exist on disk but only in memory*/
+        /* The following fields do not exist on disk but only in memory */
         bool dirty;
         fs_index_t index;
 };
 
-/*Generic MFS directory entry*/
+/* Generic MFS directory entry */
 struct mfs_dentry_info {
         uint32_t d_inum;
         char d_name[MFS3_MAX_NAME_LEN + 1];
 
-        /*The following fields do not exist on disk but only in memory*/
-
-        /*Index of the dentry in the list*/
+        /* The following fields do not exist on disk but only in memory */
+
+        /* Index of the dentry in the list */
         unsigned index;
-        /*Pointer to the node at witch the dentry belongs*/
+        /* Pointer to the node at witch the dentry belongs */
         struct mfs_node *node;
 };
@@ -136 +136 @@
 };
 
-/*MinixFS node in core*/
+/* MinixFS node in core */
 struct mfs_node {
         struct mfs_ino_info *ino_i;
@@ -145 +145 @@
 };
 
-/*mfs_ops.c*/
+/* mfs_ops.c */
 extern vfs_out_ops_t mfs_ops;
 extern libfs_ops_t mfs_libfs_ops;
@@ -152 +152 @@
 mfs_global_init(void);
 
-/*mfs_inode.c*/
+/* mfs_inode.c */
 extern int
 mfs_get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i,
-          fs_index_t index);
+    fs_index_t index);
 
 extern int
@@ -163 +163 @@
 mfs_inode_shrink(struct mfs_node *mnode, size_t size_shrink);
 
-/*mfs_rw.c*/
+/* mfs_rw.c */
 extern int
 mfs_read_map(uint32_t *b, const struct mfs_node *mnode, const uint32_t pos);
@@ -169 +169 @@
 extern int
 mfs_write_map(struct mfs_node *mnode, uint32_t pos, uint32_t new_zone,
-          uint32_t *old_zone);
+    uint32_t *old_zone);
 
 extern int
 mfs_prune_ind_zones(struct mfs_node *mnode, size_t new_size);
 
-/*mfs_dentry.c*/
+/* mfs_dentry.c */
 extern int
 mfs_read_dentry(struct mfs_node *mnode,
-                     struct mfs_dentry_info *d_info, unsigned index);
+    struct mfs_dentry_info *d_info, unsigned index);
 
 extern int
@@ -188 +188 @@
 mfs_insert_dentry(struct mfs_node *mnode, const char *d_name, fs_index_t d_inum);
 
-/*mfs_balloc.c*/
+/* mfs_balloc.c */
 extern int
 mfs_alloc_inode(struct mfs_instance *inst, uint32_t *inum);
@@ -201 +201 @@
 mfs_free_zone(struct mfs_instance *inst, uint32_t zone);
 
-/*mfs_utils.c*/
+/* mfs_utils.c */
 extern uint16_t
 conv16(bool native, uint16_t n);