--- linux/fs/minix/inode.c 2018/04/24 18:06:05 1.1.1.2 +++ linux/fs/minix/inode.c 2018/04/24 18:12:31 1.1.1.6 @@ -1,20 +1,28 @@ /* * linux/fs/minix/inode.c * - * (C) 1991 Linus Torvalds + * Copyright (C) 1991, 1992 Linus Torvalds */ -#include -#include - #include #include #include #include +#include +#include + #include +#include int sync_dev(int dev); +void minix_put_inode(struct inode *inode) +{ + inode->i_size = 0; + minix_truncate(inode); + minix_free_inode(inode); +} + void minix_put_super(struct super_block *sb) { int i; @@ -22,32 +30,45 @@ void minix_put_super(struct super_block lock_super(sb); sb->s_dev = 0; for(i = 0 ; i < MINIX_I_MAP_SLOTS ; i++) - brelse(sb->s_imap[i]); + brelse(sb->u.minix_sb.s_imap[i]); for(i = 0 ; i < MINIX_Z_MAP_SLOTS ; i++) - brelse(sb->s_zmap[i]); + brelse(sb->u.minix_sb.s_zmap[i]); free_super(sb); return; } static struct super_operations minix_sops = { minix_read_inode, - minix_put_super + minix_write_inode, + minix_put_inode, + minix_put_super, + NULL, + minix_statfs }; struct super_block *minix_read_super(struct super_block *s,void *data) { struct buffer_head *bh; + struct minix_super_block *ms; int i,dev=s->s_dev,block; lock_super(s); - if (!(bh = bread(dev,1))) { + if (!(bh = bread(dev,1,BLOCK_SIZE))) { s->s_dev=0; free_super(s); printk("bread failed\n"); return NULL; } - *((struct minix_super_block *) s) = - *((struct minix_super_block *) bh->b_data); + ms = (struct minix_super_block *) bh->b_data; + s->s_blocksize = 1024; + s->u.minix_sb.s_ninodes = ms->s_ninodes; + s->u.minix_sb.s_nzones = ms->s_nzones; + s->u.minix_sb.s_imap_blocks = ms->s_imap_blocks; + s->u.minix_sb.s_zmap_blocks = ms->s_zmap_blocks; + s->u.minix_sb.s_firstdatazone = ms->s_firstdatazone; + s->u.minix_sb.s_log_zone_size = ms->s_log_zone_size; + s->u.minix_sb.s_max_size = ms->s_max_size; + s->s_magic = ms->s_magic; brelse(bh); if (s->s_magic != MINIX_SUPER_MAGIC) { s->s_dev = 0; @@ -56,32 +77,32 @@ struct super_block *minix_read_super(str return NULL; } for (i=0;i < MINIX_I_MAP_SLOTS;i++) - s->s_imap[i] = NULL; + s->u.minix_sb.s_imap[i] = NULL; for (i=0;i < MINIX_Z_MAP_SLOTS;i++) - s->s_zmap[i] = NULL; + s->u.minix_sb.s_zmap[i] = NULL; block=2; - for (i=0 ; i < s->s_imap_blocks ; i++) - if (s->s_imap[i]=bread(dev,block)) + for (i=0 ; i < s->u.minix_sb.s_imap_blocks ; i++) + if (s->u.minix_sb.s_imap[i]=bread(dev,block,BLOCK_SIZE)) block++; else break; - for (i=0 ; i < s->s_zmap_blocks ; i++) - if (s->s_zmap[i]=bread(dev,block)) + for (i=0 ; i < s->u.minix_sb.s_zmap_blocks ; i++) + if (s->u.minix_sb.s_zmap[i]=bread(dev,block,BLOCK_SIZE)) block++; else break; - if (block != 2+s->s_imap_blocks+s->s_zmap_blocks) { + if (block != 2+s->u.minix_sb.s_imap_blocks+s->u.minix_sb.s_zmap_blocks) { for(i=0;is_imap[i]); + brelse(s->u.minix_sb.s_imap[i]); for(i=0;is_zmap[i]); + brelse(s->u.minix_sb.s_zmap[i]); s->s_dev=0; free_super(s); printk("block failed\n"); return NULL; } - s->s_imap[0]->b_data[0] |= 1; - s->s_zmap[0]->b_data[0] |= 1; + s->u.minix_sb.s_imap[0]->b_data[0] |= 1; + s->u.minix_sb.s_zmap[0]->b_data[0] |= 1; free_super(s); /* set up enough so that it can read an inode */ s->s_dev = dev; @@ -94,6 +115,21 @@ struct super_block *minix_read_super(str return s; } +void minix_statfs (struct super_block *sb, struct statfs *buf) +{ + long tmp; + + put_fs_long(MINIX_SUPER_MAGIC, &buf->f_type); + put_fs_long(1024, &buf->f_bsize); + put_fs_long(sb->u.minix_sb.s_nzones << sb->u.minix_sb.s_log_zone_size, &buf->f_blocks); + tmp = minix_count_free_blocks(sb); + put_fs_long(tmp, &buf->f_bfree); + put_fs_long(tmp, &buf->f_bavail); + put_fs_long(sb->u.minix_sb.s_ninodes, &buf->f_files); + put_fs_long(minix_count_free_inodes(sb), &buf->f_ffree); + /* Don't know what value to put in buf->f_fsid */ +} + static int _minix_bmap(struct inode * inode,int block,int create) { struct buffer_head * bh; @@ -124,7 +160,7 @@ static int _minix_bmap(struct inode * in } if (!inode->i_data[7]) return 0; - if (!(bh = bread(inode->i_dev,inode->i_data[7]))) + if (!(bh = bread(inode->i_dev,inode->i_data[7],BLOCK_SIZE))) return 0; i = ((unsigned short *) (bh->b_data))[block]; if (create && !i) @@ -143,7 +179,7 @@ static int _minix_bmap(struct inode * in } if (!inode->i_data[8]) return 0; - if (!(bh=bread(inode->i_dev,inode->i_data[8]))) + if (!(bh=bread(inode->i_dev,inode->i_data[8], BLOCK_SIZE))) return 0; i = ((unsigned short *)bh->b_data)[block>>9]; if (create && !i) @@ -154,7 +190,7 @@ static int _minix_bmap(struct inode * in brelse(bh); if (!i) return 0; - if (!(bh=bread(inode->i_dev,i))) + if (!(bh=bread(inode->i_dev,i,BLOCK_SIZE))) return 0; i = ((unsigned short *)bh->b_data)[block&511]; if (create && !i) @@ -182,9 +218,9 @@ void minix_read_inode(struct inode * ino struct minix_inode * raw_inode; int block; - block = 2 + inode->i_sb->s_imap_blocks + inode->i_sb->s_zmap_blocks + + block = 2 + inode->i_sb->u.minix_sb.s_imap_blocks + inode->i_sb->u.minix_sb.s_zmap_blocks + (inode->i_ino-1)/MINIX_INODES_PER_BLOCK; - if (!(bh=bread(inode->i_dev,block))) + if (!(bh=bread(inode->i_dev,block, BLOCK_SIZE))) panic("unable to read i-node block"); raw_inode = ((struct minix_inode *) bh->b_data) + (inode->i_ino-1)%MINIX_INODES_PER_BLOCK; @@ -199,7 +235,24 @@ void minix_read_inode(struct inode * ino else for (block = 0; block < 9; block++) inode->i_data[block] = raw_inode->i_zone[block]; brelse(bh); - inode->i_op = &minix_inode_operations; + inode->i_op = NULL; + if (S_ISREG(inode->i_mode)) + inode->i_op = &minix_file_inode_operations; + else if (S_ISDIR(inode->i_mode)) + inode->i_op = &minix_dir_inode_operations; + else if (S_ISLNK(inode->i_mode)) + inode->i_op = &minix_symlink_inode_operations; + else if (S_ISCHR(inode->i_mode)) + inode->i_op = &minix_chrdev_inode_operations; + else if (S_ISBLK(inode->i_mode)) + inode->i_op = &minix_blkdev_inode_operations; + else if (S_ISFIFO(inode->i_mode)) { + inode->i_op = &minix_fifo_inode_operations; + inode->i_size = 0; + inode->i_pipe = 1; + PIPE_HEAD(*inode) = PIPE_TAIL(*inode) = 0; + PIPE_READERS(*inode) = PIPE_WRITERS(*inode) = 0; + } } void minix_write_inode(struct inode * inode) @@ -208,9 +261,9 @@ void minix_write_inode(struct inode * in struct minix_inode * raw_inode; int block; - block = 2 + inode->i_sb->s_imap_blocks + inode->i_sb->s_zmap_blocks + + block = 2 + inode->i_sb->u.minix_sb.s_imap_blocks + inode->i_sb->u.minix_sb.s_zmap_blocks + (inode->i_ino-1)/MINIX_INODES_PER_BLOCK; - if (!(bh=bread(inode->i_dev,block))) + if (!(bh=bread(inode->i_dev, block, BLOCK_SIZE))) panic("unable to read i-node block"); raw_inode = ((struct minix_inode *)bh->b_data) + (inode->i_ino-1)%MINIX_INODES_PER_BLOCK;