minix filesystem Update to V3 for 2.6.x.y revised
Hi Pekka !
According to your suggestions, I have modified the patch for better formatting and other. Testing is going on fine. Here comes the patch attached as textfile V3_2dot6_patch3.txt
fs/minix/bitmap.c +9 -7
@@ -26,14 +26,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 ];
@@ -113,6 +113,7 @@int block;struct minix_sb_info *sbi =minix_sb (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",
@@ -121,14 +122,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 *
@@ -137,6 +138,7 @@int block;struct minix_sb_info *sbi =minix_sb (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) {
@@ -145,15 +147,15 @@return NULL ; } ino--; - block =2 + sbi->s_imap_blocks + sbi->s_zmap_blocks + - ino /MINIX2_INODES_PER_BLOCK ; + block =2 + sbi->s_imap_blocks + sbi->s_zmap_blocks + + 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 +87 -25
233 lines not on this page · raw message
fs/minix/inode.c +44 -22
126 lines not on this page · raw message
fs/minix/itree_common.c +4 -3
@@ -23,7 +23,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,
@@ -85,7 +85,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);
fs/minix/minix.h +1 -0
@@ -12,6 +12,7 @@#define MINIX_V1 0x0001/* original minix fs */ #define MINIX_V2 0x0002/* minix V2 fs */ +#define MINIX_V3 0x0003/* minix V3 fs */ /* * minix fs inode data in memory
include/linux/minix_fs.h +25 -3
@@ -23,12 +23,10 @@#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))) -/* * This is the original minix inode layout on disk. * Note the 8-bit gid and atime and ctime.
@@ -77,9 +75,33 @@ __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 ]; +};#endif
Hi Daniel,
Quoted 3 lines · Daniel Aragonés
According to your suggestions, I have modified the patch for better formatting and other. Testing is going on fine. Here comes the patch attached as textfile V3_2dot6_patch3.txt
Looks much better! Thanks for doing this. Few comments below. Perhaps you should send this to Andrew for inclusion in -mm after that?
Quoted 4 lines
fs/minix/dir.c +0
-0@@ -107,15 +112,23 @@ p = kaddr+offset; limit = kaddr +minix_last_byte (inode, n) - chunk_size;for ( ; p <= limit ; p =minix_next_entry (p, sbi)) {
fs/minix/dir.c line 123
Quoted 10 lines
fs/minix/dir.c +8
-1+minix3_dirent *de3 = (minix3_dirent *)p;minix_dirent *de = (minix_dirent *)p; -if (de->inode) { +if (sbi->s_version ==MINIX_V3 ) { + name_ptr = de3->name; + inode_ptr = de3->inode; + }else { + name_ptr = de->name; + inode_ptr = de->inode; + }
Some formatting issues above.
fs/minix/dir.c line 177
Quoted 10 lines
fs/minix/dir.c +3
-1@@ -157,9 +170,11 @@unsigned long n;unsigned long npages =dir_pages (dir);struct page *page =NULL ; +struct minix3_dir_entry *de3;struct minix_dir_entry *de; - *res_page =NULL ; +char *name_ptr; +__u32 inode_ptr;
Minor nitpick, I think you can omit the "ptr" prefix.
Quoted 5 lines
fs/minix/dir.c +1
-0@@ -301,11 +348,15 @@memset (kaddr,0 ,PAGE_CACHE_SIZE ); de = (struct minix_dir_entry *)kaddr; + de3 = (struct minix3_dir_entry *)kaddr;
fs/minix/dir.c line 359
Quoted 10 lines
fs/minix/dir.c +5
-2de->inode = inode->i_ino; -strcpy (de->name,"." ); + de3->inode = inode->i_ino; + (sbi->s_version ==MINIX_V3 ) ?strcpy (de3->name,"." ) :strcpy (de->name,"." ); de =minix_next_entry (de, sbi); + de3 =minix_next_entry (de3, sbi); de->inode = dir->i_ino; -strcpy (de->name,".." ); + de3->inode = dir->i_ino; + (sbi->s_version ==MINIX_V3 ) ?strcpy (de3->name,".." ) :strcpy (de->name,".." );
if-else is preferred.
fs/minix/dir.c line 377
Quoted 6 lines
fs/minix/dir.c +2
-0@@ -322,9 +373,12 @@struct page *page =NULL ;unsigned long i, npages =dir_pages (inode);struct minix_sb_info *sbi =minix_sb (inode->i_sb); +char *name_ptr; +__u32 inode_ptr;
Same nitpick as above.
Quoted 9 lines
include/linux/minix_fs.h +9
-0+/* +* 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;
include/linux/minix_fs.h line 96
Quoted 10 lines
include/linux/minix_fs.h +10
-0+__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; +};
I am wondering, doesn't minix filesystems have on-disk byteorder defined? That is, would __le32 or __be32 be better here?