Commit b293f02e authored by Chris Mason's avatar Chris Mason

Btrfs: Add writepages support

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 944746ec
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/version.h> #include <linux/version.h>
#include <linux/writeback.h>
#include "extent_map.h" #include "extent_map.h"
/* temporary define until extent_map moves out of btrfs */ /* temporary define until extent_map moves out of btrfs */
...@@ -35,6 +36,12 @@ struct tree_entry { ...@@ -35,6 +36,12 @@ struct tree_entry {
struct rb_node rb_node; struct rb_node rb_node;
}; };
struct extent_page_data {
struct bio *bio;
struct extent_map_tree *tree;
get_extent_t *get_extent;
};
void __init extent_map_init(void) void __init extent_map_init(void)
{ {
extent_map_cache = btrfs_cache_create("extent_map", extent_map_cache = btrfs_cache_create("extent_map",
...@@ -1460,40 +1467,76 @@ static int end_bio_extent_preparewrite(struct bio *bio, ...@@ -1460,40 +1467,76 @@ static int end_bio_extent_preparewrite(struct bio *bio,
#endif #endif
} }
static int submit_extent_page(int rw, struct extent_map_tree *tree, static struct bio *
struct page *page, sector_t sector, extent_bio_alloc(struct block_device *bdev, u64 first_sector, int nr_vecs,
size_t size, unsigned long offset, gfp_t gfp_flags)
struct block_device *bdev,
bio_end_io_t end_io_func)
{ {
struct bio *bio; struct bio *bio;
int ret = 0;
bio = bio_alloc(GFP_NOIO, 1); bio = bio_alloc(gfp_flags, nr_vecs);
bio->bi_sector = sector; if (bio == NULL && (current->flags & PF_MEMALLOC)) {
bio->bi_bdev = bdev; while (!bio && (nr_vecs /= 2))
bio->bi_io_vec[0].bv_page = page; bio = bio_alloc(gfp_flags, nr_vecs);
bio->bi_io_vec[0].bv_len = size; }
bio->bi_io_vec[0].bv_offset = offset;
bio->bi_vcnt = 1;
bio->bi_idx = 0;
bio->bi_size = size;
bio->bi_end_io = end_io_func; if (bio) {
bio->bi_private = tree; bio->bi_bdev = bdev;
bio->bi_sector = first_sector;
}
return bio;
}
static int submit_one_bio(int rw, struct bio *bio)
{
int ret = 0;
bio_get(bio); bio_get(bio);
submit_bio(rw, bio); submit_bio(rw, bio);
if (bio_flagged(bio, BIO_EOPNOTSUPP)) if (bio_flagged(bio, BIO_EOPNOTSUPP))
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
bio_put(bio); bio_put(bio);
return ret; return ret;
} }
static int submit_extent_page(int rw, struct extent_map_tree *tree,
struct page *page, sector_t sector,
size_t size, unsigned long offset,
struct block_device *bdev,
struct bio **bio_ret,
int max_pages,
bio_end_io_t end_io_func)
{
int ret = 0;
struct bio *bio;
int nr;
if (bio_ret && *bio_ret) {
bio = *bio_ret;
if (bio->bi_sector + (bio->bi_size >> 9) != sector ||
bio_add_page(bio, page, size, offset) < size) {
ret = submit_one_bio(rw, bio);
bio = NULL;
} else {
return 0;
}
}
nr = min(max_pages, bio_get_nr_vecs(bdev));
bio = extent_bio_alloc(bdev, sector, nr, GFP_NOFS | __GFP_HIGH);
if (!bio) {
printk("failed to allocate bio nr %d\n", nr);
}
bio_add_page(bio, page, size, offset);
bio->bi_end_io = end_io_func;
bio->bi_private = tree;
if (bio_ret) {
*bio_ret = bio;
} else {
ret = submit_one_bio(rw, bio);
}
return ret;
}
void set_page_extent_mapped(struct page *page) void set_page_extent_mapped(struct page *page)
{ {
if (!PagePrivate(page)) { if (!PagePrivate(page)) {
...@@ -1590,7 +1633,8 @@ int extent_read_full_page(struct extent_map_tree *tree, struct page *page, ...@@ -1590,7 +1633,8 @@ int extent_read_full_page(struct extent_map_tree *tree, struct page *page,
if (!ret) { if (!ret) {
ret = submit_extent_page(READ, tree, page, ret = submit_extent_page(READ, tree, page,
sector, iosize, page_offset, sector, iosize, page_offset,
bdev, end_bio_extent_readpage); bdev, NULL, 1,
end_bio_extent_readpage);
} }
if (ret) if (ret)
SetPageError(page); SetPageError(page);
...@@ -1613,11 +1657,12 @@ EXPORT_SYMBOL(extent_read_full_page); ...@@ -1613,11 +1657,12 @@ EXPORT_SYMBOL(extent_read_full_page);
* are found, they are marked writeback. Then the lock bits are removed * are found, they are marked writeback. Then the lock bits are removed
* and the end_io handler clears the writeback ranges * and the end_io handler clears the writeback ranges
*/ */
int extent_write_full_page(struct extent_map_tree *tree, struct page *page, static int __extent_writepage(struct page *page, struct writeback_control *wbc,
get_extent_t *get_extent, void *data)
struct writeback_control *wbc)
{ {
struct inode *inode = page->mapping->host; struct inode *inode = page->mapping->host;
struct extent_page_data *epd = data;
struct extent_map_tree *tree = epd->tree;
u64 start = (u64)page->index << PAGE_CACHE_SHIFT; u64 start = (u64)page->index << PAGE_CACHE_SHIFT;
u64 page_end = start + PAGE_CACHE_SIZE - 1; u64 page_end = start + PAGE_CACHE_SIZE - 1;
u64 end; u64 end;
...@@ -1691,7 +1736,7 @@ int extent_write_full_page(struct extent_map_tree *tree, struct page *page, ...@@ -1691,7 +1736,7 @@ int extent_write_full_page(struct extent_map_tree *tree, struct page *page,
clear_extent_dirty(tree, cur, page_end, GFP_NOFS); clear_extent_dirty(tree, cur, page_end, GFP_NOFS);
break; break;
} }
em = get_extent(inode, page, page_offset, cur, end, 1); em = epd->get_extent(inode, page, page_offset, cur, end, 1);
if (IS_ERR(em) || !em) { if (IS_ERR(em) || !em) {
SetPageError(page); SetPageError(page);
break; break;
...@@ -1734,9 +1779,12 @@ int extent_write_full_page(struct extent_map_tree *tree, struct page *page, ...@@ -1734,9 +1779,12 @@ int extent_write_full_page(struct extent_map_tree *tree, struct page *page,
if (ret) if (ret)
SetPageError(page); SetPageError(page);
else { else {
unsigned long nr = end_index + 1;
set_range_writeback(tree, cur, cur + iosize - 1); set_range_writeback(tree, cur, cur + iosize - 1);
ret = submit_extent_page(WRITE, tree, page, sector, ret = submit_extent_page(WRITE, tree, page, sector,
iosize, page_offset, bdev, iosize, page_offset, bdev,
&epd->bio, nr,
end_bio_extent_writepage); end_bio_extent_writepage);
if (ret) if (ret)
SetPageError(page); SetPageError(page);
...@@ -1750,8 +1798,44 @@ int extent_write_full_page(struct extent_map_tree *tree, struct page *page, ...@@ -1750,8 +1798,44 @@ int extent_write_full_page(struct extent_map_tree *tree, struct page *page,
unlock_page(page); unlock_page(page);
return 0; return 0;
} }
int extent_write_full_page(struct extent_map_tree *tree, struct page *page,
get_extent_t *get_extent,
struct writeback_control *wbc)
{
int ret;
struct extent_page_data epd = {
.bio = NULL,
.tree = tree,
.get_extent = get_extent,
};
ret = __extent_writepage(page, wbc, &epd);
if (epd.bio)
submit_one_bio(WRITE, epd.bio);
return ret;
}
EXPORT_SYMBOL(extent_write_full_page); EXPORT_SYMBOL(extent_write_full_page);
int extent_writepages(struct extent_map_tree *tree,
struct address_space *mapping,
get_extent_t *get_extent,
struct writeback_control *wbc)
{
int ret;
struct extent_page_data epd = {
.bio = NULL,
.tree = tree,
.get_extent = get_extent,
};
ret = write_cache_pages(mapping, wbc, __extent_writepage, &epd);
if (epd.bio)
submit_one_bio(WRITE, epd.bio);
return ret;
}
EXPORT_SYMBOL(extent_writepages);
/* /*
* basic invalidatepage code, this waits on any locked or writeback * basic invalidatepage code, this waits on any locked or writeback
* ranges corresponding to the page, and then deletes any extent state * ranges corresponding to the page, and then deletes any extent state
...@@ -1869,6 +1953,7 @@ int extent_prepare_write(struct extent_map_tree *tree, ...@@ -1869,6 +1953,7 @@ int extent_prepare_write(struct extent_map_tree *tree,
EXTENT_LOCKED, 0, NULL, GFP_NOFS); EXTENT_LOCKED, 0, NULL, GFP_NOFS);
ret = submit_extent_page(READ, tree, page, ret = submit_extent_page(READ, tree, page,
sector, iosize, page_offset, em->bdev, sector, iosize, page_offset, em->bdev,
NULL, 1,
end_bio_extent_preparewrite); end_bio_extent_preparewrite);
iocount++; iocount++;
block_start = block_start + iosize; block_start = block_start + iosize;
......
...@@ -136,6 +136,10 @@ int extent_invalidatepage(struct extent_map_tree *tree, ...@@ -136,6 +136,10 @@ int extent_invalidatepage(struct extent_map_tree *tree,
int extent_write_full_page(struct extent_map_tree *tree, struct page *page, int extent_write_full_page(struct extent_map_tree *tree, struct page *page,
get_extent_t *get_extent, get_extent_t *get_extent,
struct writeback_control *wbc); struct writeback_control *wbc);
int extent_writepages(struct extent_map_tree *tree,
struct address_space *mapping,
get_extent_t *get_extent,
struct writeback_control *wbc);
int extent_prepare_write(struct extent_map_tree *tree, int extent_prepare_write(struct extent_map_tree *tree,
struct inode *inode, struct page *page, struct inode *inode, struct page *page,
unsigned from, unsigned to, get_extent_t *get_extent); unsigned from, unsigned to, get_extent_t *get_extent);
......
...@@ -1747,6 +1747,15 @@ static int btrfs_writepage(struct page *page, struct writeback_control *wbc) ...@@ -1747,6 +1747,15 @@ static int btrfs_writepage(struct page *page, struct writeback_control *wbc)
return extent_write_full_page(tree, page, btrfs_get_extent, wbc); return extent_write_full_page(tree, page, btrfs_get_extent, wbc);
} }
static int btrfs_writepages(struct address_space *mapping,
struct writeback_control *wbc)
{
struct extent_map_tree *tree;
tree = &BTRFS_I(mapping->host)->extent_tree;
return extent_writepages(tree, mapping, btrfs_get_extent, wbc);
}
static int btrfs_releasepage(struct page *page, gfp_t unused_gfp_flags) static int btrfs_releasepage(struct page *page, gfp_t unused_gfp_flags)
{ {
struct extent_map_tree *tree; struct extent_map_tree *tree;
...@@ -2526,6 +2535,7 @@ static struct extent_map_ops btrfs_extent_map_ops = { ...@@ -2526,6 +2535,7 @@ static struct extent_map_ops btrfs_extent_map_ops = {
static struct address_space_operations btrfs_aops = { static struct address_space_operations btrfs_aops = {
.readpage = btrfs_readpage, .readpage = btrfs_readpage,
.writepage = btrfs_writepage, .writepage = btrfs_writepage,
.writepages = btrfs_writepages,
.sync_page = block_sync_page, .sync_page = block_sync_page,
.prepare_write = btrfs_prepare_write, .prepare_write = btrfs_prepare_write,
.commit_write = btrfs_commit_write, .commit_write = btrfs_commit_write,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment