--- linux/fs/inode.c 2018/04/24 18:08:40 1.1.1.9 +++ linux/fs/inode.c 2018/04/24 18:10:35 1.1.1.10 @@ -6,10 +6,10 @@ #include #include - #include #include #include + #include struct inode inode_table[NR_INODE]={{0,},}; @@ -100,7 +100,7 @@ void sync_inodes(void) inode = 0+inode_table; for(i=0 ; ii_dirt && !inode->i_pipe) + if (inode->i_dirt) write_inode(inode); } } @@ -119,27 +119,25 @@ void iput(struct inode * inode) if (inode->i_pipe) { wake_up(&inode->i_wait); wake_up(&inode->i_wait2); - if (--inode->i_count) - return; - free_page(inode->i_size); - inode->i_count=0; - inode->i_dirt=0; - inode->i_pipe=0; - return; } - if (!inode->i_dev) { +repeat: + if (inode->i_count>1) { inode->i_count--; return; } -repeat: - if (inode->i_count>1) { + if (inode->i_pipe) { + free_page(inode->i_size); + inode->i_size = 0; + } + if (!inode->i_dev) { inode->i_count--; return; } if (!inode->i_nlink) { - if (inode->i_sb && inode->i_sb->s_op && inode->i_sb->s_op->put_inode) + if (inode->i_sb && inode->i_sb->s_op && inode->i_sb->s_op->put_inode) { inode->i_sb->s_op->put_inode(inode); - return; + return; + } } if (inode->i_dirt) { write_inode(inode); /* we can sleep - so do again */ @@ -190,12 +188,13 @@ struct inode * get_pipe_inode(void) if (!(inode = get_empty_inode())) return NULL; - if (!(inode->i_size=get_free_page())) { + if (!(inode->i_size = get_free_page())) { inode->i_count = 0; return NULL; } inode->i_count = 2; /* sum of readers/writers */ PIPE_HEAD(*inode) = PIPE_TAIL(*inode) = 0; + PIPE_READERS(*inode) = PIPE_WRITERS(*inode) = 1; inode->i_pipe = 1; return inode; }