From 948e662bed806153a5293f69aa5af5d33db24005 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Mon, 15 Jan 2007 13:52:17 +0000 Subject: [PATCH] --- yaml --- r: 46293 b: refs/heads/master c: a8d638e30e768adc6956541f79f7bf05139ba475 h: refs/heads/master i: 46291: d9a73f776d7876ee15713d38ade37950ea1748ce v: v3 --- [refs] | 2 +- trunk/fs/gfs2/ops_address.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ccffa16356db..dab72da6fc0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 222d396092acc11b4af03bede309aa066945e920 +refs/heads/master: a8d638e30e768adc6956541f79f7bf05139ba475 diff --git a/trunk/fs/gfs2/ops_address.c b/trunk/fs/gfs2/ops_address.c index 37bfeb961eb3..9ddf9753a552 100644 --- a/trunk/fs/gfs2/ops_address.c +++ b/trunk/fs/gfs2/ops_address.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -156,6 +157,31 @@ static int gfs2_writepage(struct page *page, struct writeback_control *wbc) return 0; } +/** + * gfs2_writepages - Write a bunch of dirty pages back to disk + * @mapping: The mapping to write + * @wbc: Write-back control + * + * For journaled files and/or ordered writes this just falls back to the + * kernel's default writepages path for now. We will probably want to change + * that eventually (i.e. when we look at allocate on flush). + * + * For the data=writeback case though we can already ignore buffer heads + * and write whole extents at once. This is a big reduction in the + * number of I/O requests we send and the bmap calls we make in this case. + */ +int gfs2_writepages(struct address_space *mapping, struct writeback_control *wbc) +{ + struct inode *inode = mapping->host; + struct gfs2_inode *ip = GFS2_I(inode); + struct gfs2_sbd *sdp = GFS2_SB(inode); + + if (sdp->sd_args.ar_data == GFS2_DATA_WRITEBACK && !gfs2_is_jdata(ip)) + return mpage_writepages(mapping, wbc, gfs2_get_block_noalloc); + + return generic_writepages(mapping, wbc); +} + /** * stuffed_readpage - Fill in a Linux page with stuffed file data * @ip: the inode @@ -757,6 +783,7 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask) const struct address_space_operations gfs2_file_aops = { .writepage = gfs2_writepage, + .writepages = gfs2_writepages, .readpage = gfs2_readpage, .readpages = gfs2_readpages, .sync_page = block_sync_page,