minix filesystem update to V3 for 2.4 kernels
Hi Marcelo,
After 2 revisions incorporating the suggestions made by Pekka, here I attach as a text file "v3_2dot4_diff.txt" my patch for minix-fs version 3 support.
I first posted it in comp.os.minix in January 11. I have no received feedback at all. Can we trust the saying "no news, good news"?...
I have sent the same patch for 2.6 kernels to Andrew today. The present one is a port or adaptation of the 2.6 one, which was the first that I started, to the 2.4 peculiarities.
The modifications I have made to the preexistent code have been four:
1.- The layout of the superblock variables is different in version V3. Suggested by Pekka, the structure minix3_super_block has been introduced.
2.- Disable writings to "s_state" because it has been droped out from the superblock, and its former address is now used by another parameter.
3.- Change the references to the constant "BLOCK_SIZE" to the variables "s_blocksize" or "b_size", so allowing for multiple block sizes.
4.- Introduce the new structure "minix3_dir_entry" to employ 60 characters long names in the new directory entries of 64 bytes.
fs/minix/bitmap.c +8 -6
@@ -27,14 +27,14 @@for (i=0 ; i<numblocks-1 ; i++) {if (!(bh=map[i]))return (0 ); -for (j=0 ; j<BLOCK_SIZE ; j++) +for (j=0 ; j<bh->b_size; j++) sum += nibblemap[bh->b_data[j] &0xf ] + nibblemap[(bh->b_data[j]>>4 ) &0xf ]; }if (numblocks==0 || !(bh=map[numblocks-1 ]))return (0 ); - i = ((numbits-(numblocks-1 )*BLOCK_SIZE *8 )/16 )*2 ; + i = ((numbits-(numblocks-1 )*bh->b_size*8 )/16 )*2 ;for (j=0 ; j<i; j++) { sum += nibblemap[bh->b_data[j] &0xf ] + nibblemap[(bh->b_data[j]>>4 ) &0xf ];
@@ -124,6 +124,7 @@int block;struct minix_sb_info *sbi = &sb->u.minix_sb;struct minix_inode *p; +int minix_inodes_per_block =BLOCK_SIZE /sizeof (struct minix_inode );if (!ino || ino > sbi->s_ninodes) { printk("Bad inode number on dev %s: %ld is out of range\n",
@@ -132,14 +133,14 @@ } ino--; block =2 + sbi->s_imap_blocks + sbi->s_zmap_blocks + - ino /MINIX_INODES_PER_BLOCK ; + ino / minix_inodes_per_block; *bh =sb_bread (sb, block);if (!*bh) {printk ("unable to read i-node block\n" );return NULL ; } p = (void *)(*bh)->b_data; -return p + ino %MINIX_INODES_PER_BLOCK ; +return p + ino % minix_inodes_per_block; } struct minix2_inode *
@@ -148,6 +149,7 @@int block;struct minix_sb_info *sbi = &sb->u.minix_sb;struct minix2_inode *p; +int minix2_inodes_per_block = sb->s_blocksize/sizeof (struct minix2_inode ); *bh =NULL ;if (!ino || ino > sbi->s_ninodes) {
@@ -157,14 +159,14 @@ } ino--; block =2 + sbi->s_imap_blocks + sbi->s_zmap_blocks + - ino /MINIX2_INODES_PER_BLOCK ; + ino / minix2_inodes_per_block; *bh =sb_bread (sb, block);if (!*bh) {printk ("unable to read i-node block\n" );return NULL ; } p = (void *)(*bh)->b_data; -return p + ino %MINIX2_INODES_PER_BLOCK ; +return p + ino % minix2_inodes_per_block; }/* Clear the link count and mode of a deleted inode on disk. */
fs/minix/dir.c +89 -22
221 lines not on this page · raw message
fs/minix/inode.c +45 -22
144 lines not on this page · raw message
fs/minix/itree_common.c +4 -3
@@ -21,7 +21,7 @@static inline block_t *block_end (struct buffer_head *bh) { -return (block_t *)((char *)bh->b_data +BLOCK_SIZE ); +return (block_t *)((char *)bh->b_data + bh->b_size); } static inline Indirect *get_branch(struct inode *inode,
@@ -81,7 +81,7 @@ branch[n].key =cpu_to_block (nr); bh =sb_getblk (inode->i_sb, parent);lock_buffer (bh); -memset (bh->b_data,0 ,BLOCK_SIZE ); +memset (bh->b_data,0 , bh->b_size); branch[n].bh = bh; branch[n].p = (block_t *) bh->b_data + offsets[n]; *branch[n].p = branch[n].key;
@@ -292,6 +292,7 @@static inline void truncate (struct inode * inode) { +struct super_block * sb = inode->i_sb;block_t *idata =i_data (inode);int offsets[DEPTH ];Indirect chain[DEPTH ];
@@ -301,7 +302,7 @@int first_whole;long iblock; - iblock = (inode->i_size +BLOCK_SIZE -1 ) >>10 ; + iblock = (inode->i_size + sb->s_blocksize -1 ) >>10 ;block_truncate_page (inode->i_mapping, inode->i_size, get_block); n =block_to_path (inode, iblock, offsets);
include/linux/minix_fs.h +27 -3
@@ -23,14 +23,13 @@#define MINIX_SUPER_MAGIC2 0x138F/* minix fs, 30 char names */ #define MINIX2_SUPER_MAGIC 0x2468/* minix V2 fs */ #define MINIX2_SUPER_MAGIC2 0x2478/* minix V2 fs, 30 char names */ +#define MINIX3_SUPER_MAGIC 0x4d5a/* minix V3 fs */ #define MINIX_VALID_FS 0x0001/* Clean fs. */ #define MINIX_ERROR_FS 0x0002/* fs has errors. */ -#define MINIX_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix_inode))) -#define MINIX2_INODES_PER_BLOCK ((BLOCK_SIZE)/(sizeof (struct minix2_inode))) -#define MINIX_V1 0x0001/* original minix fs */ #define MINIX_V2 0x0002/* minix V2 fs */ +#define MINIX_V3 0x0003/* minix V3 fs */ #define INODE_VERSION (inode) inode->i_sb->u.minix_sb.s_version
@@ -82,11 +81,36 @@__u32 s_zones; }; +/* +* V3 minix super-block data on disk +*/ +struct minix3_super_block { +__u16 s_ninodes; +__u16 s_nzones; +__u16 s_pad0; +__u16 s_imap_blocks; +__u16 s_zmap_blocks; +__u16 s_firstdatazone; +__u16 s_log_zone_size; +__u16 s_pad1; +__u32 s_max_size; +__u32 s_zones; +__u16 s_magic; +__u16 s_pad2; +__u16 s_blocksize; +__u8 s_disk_version; +}; +struct minix_dir_entry {__u16 inode;char name[0 ]; }; +struct minix3_dir_entry { +__u32 inode; +char name[0 ]; +}; +#ifdef __KERNEL__/*