minix filesystem update to V3 for 2.6 kernels
Hi Andrew,
As a continuation of my former communication of January 25, and after having posted the attached patch in my personal page http://www.terra.es/personal2/danarag for about 3 months, feedback has come to me, and some bugs have been detected and corrected.
I believe that now (not before) the patch is really ready for merging into the main line if you consider it appropriate.
Thanks for your attention.
fs/minix/bitmap.c +85 -33
@@ -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 ];
@@ -48,12 +48,24 @@return (sum); } -void minix_free_block (struct inode * inode,int block) +int minix3_block_size_shift (struct super_block *sb) +{ +int k =0 ; +if (sb->s_blocksize !=1024 ) + k = sb->s_blocksize >>11 ; +if (sb->s_blocksize >=8192 ) + k =2 + (sb->s_blocksize >>13 ); +return k; +} + +void minix_free_block (struct inode * inode,unsigned long block) {struct super_block * sb = inode->i_sb;struct minix_sb_info * sbi =minix_sb (sb);struct buffer_head * bh; -unsigned int bit,zone; +int k =minix3_block_size_shift (sb); +int mask =15 ; +unsigned long bit,zone;if (block < sbi->s_firstdatazone || block >= sbi->s_nzones) {printk ("trying to free block not in datazone\n" );
@@ -62,16 +74,21 @@ zone = block - sbi->s_firstdatazone +1 ; bit = zone &8191 ; zone >>=13 ; -if (zone >= sbi->s_zmap_blocks) { +if ((zone >> k) >= sbi->s_zmap_blocks) {printk ("minix_free_block: nonexistent bitmap buffer\n" );return ; } - bh = sbi->s_zmap[zone]; +char *offset =kmalloc (sizeof (char *),GFP_KERNEL ); + bh = sbi->s_zmap[zone >> k]; + mask >>= (4 -k); + offset = (char *)bh->b_data; + offset += (zone & mask)*1024 ;lock_kernel (); -if (!minix_test_and_clear_bit (bit,bh->b_data)) -printk ("free_block (%s:%d): bit already cleared\n" , +if (!minix_test_and_clear_bit (bit, offset)) +printk ("free_block (%s:%lu): bit already cleared\n" , sb->s_id, block);unlock_kernel (); + offset =NULL ;mark_buffer_dirty (bh);return ; }
@@ -79,24 +96,35 @@int minix_new_block (struct inode * inode) {struct minix_sb_info *sbi =minix_sb (inode->i_sb); -int i; +char *offset =kmalloc (sizeof (char *),GFP_KERNEL ); +int num_1K_blocks = (inode->i_sb->s_blocksize)/1024 ; +int bits_per_zone =8 * (inode->i_sb->s_blocksize); +int i, k;for (i =0 ; i < sbi->s_zmap_blocks; i++) {struct buffer_head *bh = sbi->s_zmap[i]; -int j; +for (k =0 ; k < num_1K_blocks; k++) { +int j; -lock_kernel (); -if ((j =minix_find_first_zero_bit (bh->b_data,8192 )) <8192 ) { -minix_set_bit (j,bh->b_data); -unlock_kernel (); -mark_buffer_dirty (bh); - j += i*8192 + sbi->s_firstdatazone-1 ; -if (j < sbi->s_firstdatazone || j >= sbi->s_nzones) -break ; -return j; + offset = (char *)bh->b_data; + offset += k*1024 ; +lock_kernel (); +if ((j =minix_find_first_zero_bit (offset,8192 )) + <8192 ) { +minix_set_bit (j, offset); +unlock_kernel (); + offset =NULL ; +mark_buffer_dirty (bh); + j += k*8192 + i*bits_per_zone + sbi->s_firstdatazone-1 ; +if (j < sbi->s_firstdatazone || j >= sbi->s_nzones) + goto break_both; +return j; + } }unlock_kernel (); } +break_both: + offset =NULL ;return 0 ; }
@@ -113,6 +141,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 +150,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 +166,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) {
@@ -146,14 +176,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. */
@@ -187,25 +217,34 @@ {struct minix_sb_info *sbi =minix_sb (inode->i_sb);struct buffer_head * bh; -unsigned long ino; +int k =minix3_block_size_shift (inode->i_sb); +int mask =15 ; +unsigned long ino, bit; ino = inode->i_ino;if (ino <1 || ino > sbi->s_ninodes) {printk ("minix_free_inode: inode 0 or nonexistent inode\n" ); goto out; } -if ((ino >>13 ) >= sbi->s_imap_blocks) { + bit = ino &8191 ; + ino >>=13 ; + mask >>= (4 -k); +if ((ino >> k) >= sbi->s_imap_blocks) {printk ("minix_free_inode: nonexistent imap in superblock\n" ); goto out; }minix_clear_inode (inode);/* clear on-disk copy */ - bh = sbi->s_imap[ino >>13 ]; +char *offset =kmalloc (sizeof (char *),GFP_KERNEL ); + bh = sbi->s_imap[ino >> k]; + offset = (char *)bh->b_data; + offset += (ino & mask)*1024 ;lock_kernel (); -if (!minix_test_and_clear_bit (ino &8191 , bh->b_data)) -printk ("minix_free_inode: bit %lu already cleared.\n" , ino); +if (!minix_test_and_clear_bit (bit, offset)) +printk ("minix_free_inode: bit %lu already cleared.\n" , bit);unlock_kernel (); + offset =NULL ;mark_buffer_dirty (bh); out:clear_inode (inode);/* clear in-memory copy */
@@ -217,7 +256,10 @@struct minix_sb_info *sbi =minix_sb (sb);struct inode *inode =new_inode (sb);struct buffer_head * bh; -int i,j; +unsigned long j; +int num_1K_blocks = (inode->i_sb->s_blocksize)/1024 ; +int bits_per_zone =8 * sb->s_blocksize; +int i, k;if (!inode) { *error = -ENOMEM ;
@@ -226,26 +268,36 @@ j =8192 ; bh =NULL ; *error = -ENOSPC ; +char *offset =kmalloc (sizeof (char *),GFP_KERNEL );lock_kernel ();for (i =0 ; i < sbi->s_imap_blocks; i++) { bh = sbi->s_imap[i]; -if ((j =minix_find_first_zero_bit (bh->b_data,8192 )) <8192 ) -break ; +for (k =0 ; k < num_1K_blocks; k++) { + offset = (char *)bh->b_data; + offset += k*1024 ; +if ((j =minix_find_first_zero_bit (offset,8192 )) + <8192 ) + goto break_both; + } } +break_both:if (!bh || j >=8192 ) {unlock_kernel (); + offset =NULL ;iput (inode);return NULL ; } -if (minix_test_and_set_bit (j,bh->b_data)) {/* shouldn't happen */ +if (minix_test_and_set_bit (j, offset)) {/* shouldn't happen */ printk ("new_inode: bit already set" );unlock_kernel (); + offset =NULL ;iput (inode);return NULL ; }unlock_kernel (); + offset =NULL ;mark_buffer_dirty (bh); - j += i*8192 ; + j += i*bits_per_zone + k*8192 ;if (!j || j > sbi->s_ninodes) {iput (inode);return NULL ;
fs/minix/dir.c +92 -22
232 lines not on this page · raw message
fs/minix/inode.c +38 -11
103 lines not on this page · raw message
fs/minix/itree_common.c +12 -7
@@ -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,8 @@static inline void truncate (struct inode * inode) { +struct super_block * sb = inode->i_sb; +int k =minix3_block_size_shift (sb);block_t *idata =i_data (inode);int offsets[DEPTH ];Indirect chain[DEPTH ];
@@ -301,7 +303,7 @@int first_whole;long iblock; - iblock = (inode->i_size +BLOCK_SIZE -1 ) >>10 ; + iblock = (inode->i_size + sb->s_blocksize -1 ) >> (10 +k);block_truncate_page (inode->i_mapping, inode->i_size, get_block); n =block_to_path (inode, iblock, offsets);
@@ -346,15 +348,18 @@mark_inode_dirty (inode); } -static inline unsigned nblocks (loff_t size) +static inline unsigned nblocks (loff_t size,struct dentry *dentry) { +struct inode * dir = dentry->d_parent->d_inode; +struct super_block * sb = dir->i_sb; +int k =minix3_block_size_shift (sb);unsigned blocks, res, direct =DIRECT , i =DEPTH ; - blocks = (size +BLOCK_SIZE -1 ) >>BLOCK_SIZE_BITS ; + blocks = (size + sb->s_blocksize -1 ) >> (BLOCK_SIZE_BITS + k); res = blocks;while (--i && blocks > direct) { blocks -= direct; - blocks +=BLOCK_SIZE /sizeof (block_t) -1 ; - blocks /=BLOCK_SIZE /sizeof (block_t); + blocks += sb->s_blocksize/sizeof (block_t) -1 ; + blocks /= sb->s_blocksize/sizeof (block_t); res += blocks; direct =1 ; }
fs/minix/itree_v1.c +2 -2
@@ -55,7 +55,7 @@truncate (inode); } -unsigned V1_minix_blocks (loff_t size) +unsigned V1_minix_blocks (loff_t size,struct dentry * dentry) { -return nblocks (size); +return nblocks (size, dentry); }
fs/minix/itree_v2.c +4 -3
@@ -23,10 +23,11 @@static int block_to_path (struct inode * inode,long block,int offsets[DEPTH ]) {int n =0 ; +struct super_block * sb = inode->i_sb;if (block <0 ) {printk ("minix_bmap: block<0" ); - }else if (block >= (minix_sb (inode->i_sb)->s_max_size/BLOCK_SIZE )) { + }else if (block >= (minix_sb (inode->i_sb)->s_max_size/sb->s_blocksize)) {printk ("minix_bmap: block>big" ); }else if (block <7 ) { offsets[n++] = block;
@@ -60,7 +61,7 @@truncate (inode); } -unsigned V2_minix_blocks (loff_t size) +unsigned V2_minix_blocks (loff_t size,struct dentry * dentry) { -return nblocks (size); +return nblocks (size, dentry); }
fs/minix/minix.h +5 -8
@@ -7,11 +7,10 @@* truncated. Else they will be disallowed (ENAMETOOLONG). */ #define NO_TRUNCATE 1 -#define INODE_VERSION (inode) minix_sb(inode->i_sb)->s_version -#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
@@ -52,12 +51,10 @@extern void minix_free_inode (struct inode * inode);extern unsigned long minix_count_free_inodes (struct minix_sb_info *sbi);extern int minix_new_block (struct inode * inode); -extern void minix_free_block (struct inode * inode,int block); +extern void minix_free_block (struct inode * inode,unsigned long block);extern unsigned long minix_count_free_blocks (struct minix_sb_info *sbi); -extern int minix_getattr (struct vfsmount *,struct dentry *,struct kstat *); -extern void V2_minix_truncate (struct inode *);extern void V1_minix_truncate (struct inode *);extern void V2_minix_truncate (struct inode *);extern void minix_truncate (struct inode *);
@@ -65,8 +62,8 @@extern void minix_set_inode (struct inode *,dev_t );extern int V1_minix_get_block (struct inode *,long ,struct buffer_head *,int );extern int V2_minix_get_block (struct inode *,long ,struct buffer_head *,int ); -extern unsigned V1_minix_blocks (loff_t ); -extern unsigned V2_minix_blocks (loff_t ); +extern unsigned V1_minix_blocks (loff_t ,struct dentry *); +extern unsigned V2_minix_blocks (loff_t ,struct dentry *);extern struct minix_dir_entry *minix_find_entry (struct dentry *,struct page **);extern int minix_add_link (struct dentry *,struct inode *);
@@ -76,8 +73,8 @@extern void minix_set_link (struct minix_dir_entry *,struct page *,struct inode *);extern struct minix_dir_entry *minix_dotdot (struct inode *,struct page **);extern ino_t minix_inode_by_name (struct dentry *); -extern int minix_sync_file (struct file *,struct dentry *,int ); +extern int minix3_block_size_shift (struct super_block * sb);extern struct inode_operations minix_file_inode_operations;extern struct inode_operations minix_dir_inode_operations;
include/linux/minix_fs.h +25 -2
@@ -23,11 +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.
@@ -77,9 +76,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
Quoted 5 lines · Daniel Aragonés
Hi Andrew,
As a continuation of my former communication of January 25, and after having posted the attached patch in my personal page http://www.terra.es/personal2/danarag for about 3 months, feedback has come to me, and some bugs have been detected and corrected.
People use minixfs? I'm a bit surprised.
Quoted 1 line
I believe that now (not before) the patch is really ready for merging into the main line if you consider it appropriate.
We'd need a detailed changelog please.
Quoted 1 line
Signed-off-by Daniel Aragones <[email protected]>
The patch gets lots of rejects. More than I'm prepared to fix up so I can take a look at it in tkdiff, unfortunately.
I suspect the patch was against some prehistoric kernel like 2.6.16 ;)
fs/minix/bitmap.c line 99
Quoted 6 lines
fs/minix/bitmap.c +1
-1@@ -79,24 +96,35 @@int minix_new_block (struct inode * inode) {struct minix_sb_info *sbi =minix_sb (inode->i_sb); -int i; +char *offset =kmalloc (sizeof (char *),GFP_KERNEL );
That's a peculiar thing to do.
Quoted 10 lines
fs/minix/bitmap.c +5
-1+int num_1K_blocks = (inode->i_sb->s_blocksize)/1024 ; +int bits_per_zone =8 * (inode->i_sb->s_blocksize); +int i, k;for (i =0 ; i < sbi->s_zmap_blocks; i++) {struct buffer_head *bh = sbi->s_zmap[i]; -int j; +for (k =0 ; k < num_1K_blocks; k++) { +int j;
fs/minix/bitmap.c line 109
Quoted 10 lines
fs/minix/bitmap.c +1
-9-lock_kernel (); -if ((j =minix_find_first_zero_bit (bh->b_data,8192 )) <8192 ) { -minix_set_bit (j,bh->b_data); -unlock_kernel (); -mark_buffer_dirty (bh); - j += i*8192 + sbi->s_firstdatazone-1 ; -if (j < sbi->s_firstdatazone || j >= sbi->s_nzones) -break ; -return j; + offset = (char *)bh->b_data;
And here I think we've just leaked that memory.
Quoted 4 lines
fs/minix/bitmap.c +4
-0+ bit = ino &8191 ; + ino >>=13 ; + mask >>= (4 -k); +if ((ino >> k) >= sbi->s_imap_blocks) {
fs/minix/bitmap.c line 241
Quoted 10 lines
fs/minix/bitmap.c +3
-1printk ("minix_free_inode: nonexistent imap in superblock\n" ); goto out; }minix_clear_inode (inode);/* clear on-disk copy */ - bh = sbi->s_imap[ino >>13 ]; +char *offset =kmalloc (sizeof (char *),GFP_KERNEL ); + bh = sbi->s_imap[ino >> k]; + offset = (char *)bh->b_data;
And again. Here we've definitely leaked it.
fs/minix/bitmap.c line 276
Quoted 12 lines
fs/minix/bitmap.c +3
-2@@ -226,26 +268,36 @@ j =8192 ; bh =NULL ; *error = -ENOSPC ; +char *offset =kmalloc (sizeof (char *),GFP_KERNEL );lock_kernel ();for (i =0 ; i < sbi->s_imap_blocks; i++) { bh = sbi->s_imap[i]; -if ((j =minix_find_first_zero_bit (bh->b_data,8192 )) <8192 ) -break ; +for (k =0 ; k < num_1K_blocks; k++) { + offset = (char *)bh->b_data;
again
Quoted 9 lines
fs/minix/bitmap.c line 99
Quoted 7 lines
fs/minix/bitmap.c +1
-1@@ -79,24 +96,35 @@int minix_new_block (struct inode * inode) {struct minix_sb_info *sbi =minix_sb (inode->i_sb); -int i; +char *offset =kmalloc (sizeof (char *),GFP_KERNEL );That's a peculiar thing to do.
yeah it should it least be GFP_NOFS probably ;)
Quoted 7 lines
Quoted 4 lines
Hi Andrew,
As a continuation of my former communication of January 25, and after having posted the attached patch in my personal page http://www.terra.es/personal2/danarag for about 3 months, feedback has come to me, and some bugs have been detected and corrected.
People use minixfs? I'm a bit surprised.
The potential is there, esp. since minix3 was released not too long ago.
Jan Engelhardt