Messages in this thread Patch in this message | | | Date | Sat, 01 Jun 2002 01:42:43 -0700 | From | Andrew Morton <> | Subject | [patch 9/16] direct-to-BIO writeback for writeback-mode ext3 |
| |
Turn on direct-to-BIO writeback for ext3 in data=writeback mode.
=====================================
--- 2.5.19/fs/ext3/inode.c~ext3-writepages Sat Jun 1 01:18:10 2002 +++ 2.5.19-akpm/fs/ext3/inode.c Sat Jun 1 01:18:10 2002 @@ -1389,6 +1389,34 @@ struct address_space_operations ext3_aop releasepage: ext3_releasepage, /* BKL not held. Don't need */ }; +/* For writeback mode, we can use mpage_writepages() */ + +static int +ext3_writepages(struct address_space *mapping, int *nr_to_write) +{ + int ret; + int err; + + ret = write_mapping_buffers(mapping); + err = mpage_writepages(mapping, nr_to_write, ext3_get_block); + if (!ret) + ret = err; + return ret; +} + +struct address_space_operations ext3_writeback_aops = { + readpage: ext3_readpage, /* BKL not held. Don't need */ + readpages: ext3_readpages, /* BKL not held. Don't need */ + writepage: ext3_writepage, /* BKL not held. We take it */ + writepages: ext3_writepages, /* BKL not held. Don't need */ + sync_page: block_sync_page, + prepare_write: ext3_prepare_write, /* BKL not held. We take it */ + commit_write: ext3_commit_write, /* BKL not held. We take it */ + bmap: ext3_bmap, /* BKL held */ + flushpage: ext3_flushpage, /* BKL not held. Don't need */ + releasepage: ext3_releasepage, /* BKL not held. Don't need */ +}; + /* * ext3_block_truncate_page() zeroes out a mapping from file offset `from' * up to the end of the block which corresponds to `from'. @@ -2159,7 +2187,10 @@ void ext3_read_inode(struct inode * inod else if (S_ISREG(inode->i_mode)) { inode->i_op = &ext3_file_inode_operations; inode->i_fop = &ext3_file_operations; - inode->i_mapping->a_ops = &ext3_aops; + if (ext3_should_writeback_data(inode)) + inode->i_mapping->a_ops = &ext3_writeback_aops; + else + inode->i_mapping->a_ops = &ext3_aops; } else if (S_ISDIR(inode->i_mode)) { inode->i_op = &ext3_dir_inode_operations; inode->i_fop = &ext3_dir_operations; @@ -2168,7 +2199,10 @@ void ext3_read_inode(struct inode * inod inode->i_op = &ext3_fast_symlink_inode_operations; else { inode->i_op = &page_symlink_inode_operations; - inode->i_mapping->a_ops = &ext3_aops; + if (ext3_should_writeback_data(inode)) + inode->i_mapping->a_ops = &ext3_writeback_aops; + else + inode->i_mapping->a_ops = &ext3_aops; } } else init_special_inode(inode, inode->i_mode, --- 2.5.19/include/linux/ext3_jbd.h~ext3-writepages Sat Jun 1 01:18:10 2002 +++ 2.5.19-akpm/include/linux/ext3_jbd.h Sat Jun 1 01:18:10 2002 @@ -299,5 +299,10 @@ static inline int ext3_should_order_data return (test_opt(inode->i_sb, DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA); } +static inline int ext3_should_writeback_data(struct inode *inode) +{ + return !ext3_should_journal_data(inode) && + !ext3_should_order_data(inode); +} #endif /* _LINUX_EXT3_JBD_H */ --- 2.5.19/include/linux/ext3_fs.h~ext3-writepages Sat Jun 1 01:18:10 2002 +++ 2.5.19-akpm/include/linux/ext3_fs.h Sat Jun 1 01:18:10 2002 @@ -695,6 +695,7 @@ extern struct file_operations ext3_file_ /* inode.c */ extern struct address_space_operations ext3_aops; +extern struct address_space_operations ext3_writeback_aops; /* namei.c */ extern struct inode_operations ext3_dir_inode_operations; --- 2.5.19/fs/ext3/namei.c~ext3-writepages Sat Jun 1 01:18:10 2002 +++ 2.5.19-akpm/fs/ext3/namei.c Sat Jun 1 01:18:10 2002 @@ -510,7 +510,10 @@ static int ext3_create (struct inode * d if (!IS_ERR(inode)) { inode->i_op = &ext3_file_inode_operations; inode->i_fop = &ext3_file_operations; - inode->i_mapping->a_ops = &ext3_aops; + if (ext3_should_writeback_data(inode)) + inode->i_mapping->a_ops = &ext3_writeback_aops; + else + inode->i_mapping->a_ops = &ext3_aops; ext3_mark_inode_dirty(handle, inode); err = ext3_add_nondir(handle, dentry, inode); } @@ -985,7 +988,10 @@ static int ext3_symlink (struct inode * if (l > sizeof (EXT3_I(inode)->i_data)) { inode->i_op = &page_symlink_inode_operations; - inode->i_mapping->a_ops = &ext3_aops; + if (ext3_should_writeback_data(inode)) + inode->i_mapping->a_ops = &ext3_writeback_aops; + else + inode->i_mapping->a_ops = &ext3_aops; /* * page_symlink() calls into ext3_prepare/commit_write. * We have a transaction open. All is sweetness. It also sets - - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |