Index: uspace/lib/minix/minix.h =================================================================== --- uspace/lib/minix/minix.h (revision 54464f6afe1f85435c8078ec0d5857463b583cc5) +++ uspace/lib/minix/minix.h (revision 50a01a9028d45359e5a70b1aaf8ce80884c2cfa9) @@ -39,9 +39,9 @@ #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) -#define S_IFDIR 0040000 /*Directory*/ -#define S_IFREG 0100000 /*Regular file*/ +#define S_IFDIR 0040000 /* Directory */ +#define S_IFREG 0100000 /* Regular file */ #define S_IFMT 00170000 -/*The following block sizes are valid only on V3 filesystem*/ +/* The following block sizes are valid only on V3 filesystem */ #define MFS_MIN_BLOCKSIZE 1024 #define MFS_MAX_BLOCKSIZE 4096 @@ -88,19 +88,19 @@ #define MFS_ERROR_FS 0x0002 -/*MFS V1/V2 superblock data on disk*/ +/* MFS V1/V2 superblock data on disk */ struct mfs_superblock { - /*Total number of inodes on the device*/ + /* Total number of inodes on the device */ uint16_t s_ninodes; - /*Total number of zones on the device*/ + /* Total number of zones on the device */ uint16_t s_nzones; - /*Number of inode bitmap blocks*/ + /* Number of inode bitmap blocks */ uint16_t s_ibmap_blocks; - /*Number of zone bitmap blocks*/ + /* Number of zone bitmap blocks */ uint16_t s_zbmap_blocks; - /*First data zone on device*/ + /* First data zone on device */ uint16_t s_first_data_zone; - /*Base 2 logarithm of the zone to block ratio*/ + /* Base 2 logarithm of the zone to block ratio */ uint16_t s_log2_zone_size; - /*Maximum file size expressed in bytes*/ + /* Maximum file size expressed in bytes */ uint32_t s_max_file_size; /* @@ -109,28 +109,28 @@ */ uint16_t s_magic; - /*Flag used to detect FS errors*/ + /* Flag used to detect FS errors*/ uint16_t s_state; - /*Total number of zones on the device (V2 only)*/ + /* Total number of zones on the device (V2 only) */ uint32_t s_nzones2; } __attribute__ ((packed)); -/*MFS V3 superblock data on disk*/ +/* MFS V3 superblock data on disk */ struct mfs3_superblock { - /*Total number of inodes on the device*/ + /* Total number of inodes on the device */ uint32_t s_ninodes; uint16_t s_pad0; - /*Number of inode bitmap blocks*/ + /* Number of inode bitmap blocks */ int16_t s_ibmap_blocks; - /*Number of zone bitmap blocks*/ + /* Number of zone bitmap blocks */ int16_t s_zbmap_blocks; - /*First data zone on device*/ + /* First data zone on device */ uint16_t s_first_data_zone; - /*Base 2 logarithm of the zone to block ratio*/ + /* Base 2 logarithm of the zone to block ratio */ int16_t s_log2_zone_size; int16_t s_pad1; - /*Maximum file size expressed in bytes*/ + /* Maximum file size expressed in bytes */ uint32_t s_max_file_size; - /*Total number of zones on the device*/ + /* Total number of zones on the device */ uint32_t s_nzones; /* @@ -140,11 +140,11 @@ int16_t s_magic; int16_t s_pad2; - /*Filesystem block size expressed in bytes*/ + /* Filesystem block size expressed in bytes */ uint16_t s_block_size; - /*Filesystem disk format version*/ + /* Filesystem disk format version */ int8_t s_disk_version; } __attribute__ ((packed)); -/*MinixFS V1 inode structure as it is on disk*/ +/* MinixFS V1 inode structure as it is on disk */ struct mfs_inode { uint16_t i_mode; @@ -154,11 +154,11 @@ uint8_t i_gid; uint8_t i_nlinks; - /*Block numbers for direct zones*/ + /* Block numbers for direct zones */ uint16_t i_dzone[V1_NR_DIRECT_ZONES]; - /*Block numbers for indirect zones*/ + /* Block numbers for indirect zones */ uint16_t i_izone[V1_NR_INDIRECT_ZONES]; } __attribute__ ((packed)); -/*MinixFS V2 inode structure as it is on disk (also valid for V3).*/ +/* MinixFS V2 inode structure as it is on disk (also valid for V3). */ struct mfs2_inode { uint16_t i_mode; @@ -170,11 +170,11 @@ 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]; } __attribute__ ((packed)); -/*MinixFS V1/V2 directory entry on-disk structure*/ +/* MinixFS V1/V2 directory entry on-disk structure */ struct mfs_dentry { uint16_t d_inum; @@ -182,5 +182,5 @@ }; -/*MinixFS V3 directory entry on-disk structure*/ +/* MinixFS V3 directory entry on-disk structure */ struct mfs3_dentry { uint32_t d_inum; Index: uspace/srv/fs/mfs/mfs.h =================================================================== --- uspace/srv/fs/mfs/mfs.h (revision 54464f6afe1f85435c8078ec0d5857463b583cc5) +++ uspace/srv/fs/mfs/mfs.h (revision 50a01a9028d45359e5a70b1aaf8ce80884c2cfa9) @@ -48,5 +48,5 @@ #define NAME "mfs" -//#define DEBUG_MODE +/* #define DEBUG_MODE */ #define min(a, b) ((a) < (b) ? (a) : (b)) @@ -71,5 +71,5 @@ } mfs_version_t; -/*Generic MinixFS superblock*/ +/* Generic MinixFS superblock */ struct mfs_sb_info { uint32_t ninodes; @@ -84,5 +84,5 @@ 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,5 +97,5 @@ }; -/*Generic MinixFS inode*/ +/* Generic MinixFS inode */ struct mfs_ino_info { uint16_t i_mode; @@ -107,24 +107,24 @@ 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,5 +136,5 @@ }; -/*MinixFS node in core*/ +/* MinixFS node in core */ struct mfs_node { struct mfs_ino_info *ino_i; @@ -145,5 +145,5 @@ }; -/*mfs_ops.c*/ +/* mfs_ops.c */ extern vfs_out_ops_t mfs_ops; extern libfs_ops_t mfs_libfs_ops; @@ -152,5 +152,5 @@ 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, @@ -163,5 +163,5 @@ 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); @@ -174,5 +174,5 @@ 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, @@ -188,5 +188,5 @@ 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,5 +201,5 @@ 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);