Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 531f4b1a authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'for-chris' of git://github.com/sensille/linux into integration 



Conflicts:
	fs/btrfs/ctree.h

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parents c06a0e12 7a26285e

fs/btrfs/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ 
	   extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \

	   extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \

	   export.o tree-log.o free-space-cache.o zlib.o lzo.o \

	   compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o

	   compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o \

	   reada.o



btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

fs/btrfs/ctree.h

+21 −0
Original line number Diff line number Diff line
@@ -1074,6 +1074,7 @@ struct btrfs_fs_info { 
	struct btrfs_workers endio_freespace_worker;

	struct btrfs_workers submit_workers;

	struct btrfs_workers caching_workers;

	struct btrfs_workers readahead_workers;



	/*

	 * fixup workers take dirty pages that didn't properly go through
@@ -1158,6 +1159,10 @@ struct btrfs_fs_info { 


	struct btrfs_delayed_root *delayed_root;



	/* readahead tree */

	spinlock_t reada_lock;

	struct radix_tree_root reada_tree;



	/* next backup root to be overwritten */

	int backup_root_index;

};
@@ -2812,4 +2817,20 @@ int btrfs_scrub_cancel_devid(struct btrfs_root *root, u64 devid); 
int btrfs_scrub_progress(struct btrfs_root *root, u64 devid,

			 struct btrfs_scrub_progress *progress);



/* reada.c */

struct reada_control {

	struct btrfs_root	*root;		/* tree to prefetch */

	struct btrfs_key	key_start;

	struct btrfs_key	key_end;	/* exclusive */

	atomic_t		elems;

	struct kref		refcnt;

	wait_queue_head_t	wait;

};

struct reada_control *btrfs_reada_add(struct btrfs_root *root,

			      struct btrfs_key *start, struct btrfs_key *end);

int btrfs_reada_wait(void *handle);

void btrfs_reada_detach(void *handle);

int btree_readahead_hook(struct btrfs_root *root, struct extent_buffer *eb,

			 u64 start, int err);



#endif

fs/btrfs/disk-io.c

+82 −2
Original line number Diff line number Diff line
@@ -366,7 +366,8 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root, 
	clear_bit(EXTENT_BUFFER_CORRUPT, &eb->bflags);

	io_tree = &BTRFS_I(root->fs_info->btree_inode)->io_tree;

	while (1) {

		ret = read_extent_buffer_pages(io_tree, eb, start, 1,

		ret = read_extent_buffer_pages(io_tree, eb, start,

					       WAIT_COMPLETE,

					       btree_get_extent, mirror_num);

		if (!ret &&

		    !verify_parent_transid(io_tree, eb, parent_transid))
@@ -607,11 +608,47 @@ static int btree_readpage_end_io_hook(struct page *page, u64 start, u64 end, 
	end = min_t(u64, eb->len, PAGE_CACHE_SIZE);

	end = eb->start + end - 1;

err:

	if (test_bit(EXTENT_BUFFER_READAHEAD, &eb->bflags)) {

		clear_bit(EXTENT_BUFFER_READAHEAD, &eb->bflags);

		btree_readahead_hook(root, eb, eb->start, ret);

	}



	free_extent_buffer(eb);

out:

	return ret;

}



static int btree_io_failed_hook(struct bio *failed_bio,

			 struct page *page, u64 start, u64 end,

			 struct extent_state *state)

{

	struct extent_io_tree *tree;

	unsigned long len;

	struct extent_buffer *eb;

	struct btrfs_root *root = BTRFS_I(page->mapping->host)->root;



	tree = &BTRFS_I(page->mapping->host)->io_tree;

	if (page->private == EXTENT_PAGE_PRIVATE)

		goto out;

	if (!page->private)

		goto out;



	len = page->private >> 2;

	WARN_ON(len == 0);



	eb = alloc_extent_buffer(tree, start, len, page);

	if (eb == NULL)

		goto out;



	if (test_bit(EXTENT_BUFFER_READAHEAD, &eb->bflags)) {

		clear_bit(EXTENT_BUFFER_READAHEAD, &eb->bflags);

		btree_readahead_hook(root, eb, eb->start, -EIO);

	}



out:

	return -EIO;	/* we fixed nothing */

}



static void end_workqueue_bio(struct bio *bio, int err)

{

	struct end_io_wq *end_io_wq = bio->bi_private;
@@ -973,11 +1010,43 @@ int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize, 
	if (!buf)

		return 0;

	read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree,

				 buf, 0, 0, btree_get_extent, 0);

				 buf, 0, WAIT_NONE, btree_get_extent, 0);

	free_extent_buffer(buf);

	return ret;

}



int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,

			 int mirror_num, struct extent_buffer **eb)

{

	struct extent_buffer *buf = NULL;

	struct inode *btree_inode = root->fs_info->btree_inode;

	struct extent_io_tree *io_tree = &BTRFS_I(btree_inode)->io_tree;

	int ret;



	buf = btrfs_find_create_tree_block(root, bytenr, blocksize);

	if (!buf)

		return 0;



	set_bit(EXTENT_BUFFER_READAHEAD, &buf->bflags);



	ret = read_extent_buffer_pages(io_tree, buf, 0, WAIT_PAGE_LOCK,

				       btree_get_extent, mirror_num);

	if (ret) {

		free_extent_buffer(buf);

		return ret;

	}



	if (test_bit(EXTENT_BUFFER_CORRUPT, &buf->bflags)) {

		free_extent_buffer(buf);

		return -EIO;

	} else if (extent_buffer_uptodate(io_tree, buf, NULL)) {

		*eb = buf;

	} else {

		free_extent_buffer(buf);

	}

	return 0;

}



struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root,

					    u64 bytenr, u32 blocksize)

{
@@ -1904,6 +1973,10 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
	fs_info->trans_no_join = 0;

	fs_info->free_chunk_space = 0;



	/* readahead state */

	INIT_RADIX_TREE(&fs_info->reada_tree, GFP_NOFS & ~__GFP_WAIT);

	spin_lock_init(&fs_info->reada_lock);



	fs_info->thread_pool_size = min_t(unsigned long,

					  num_online_cpus() + 2, 8);
@@ -2103,6 +2176,9 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
	btrfs_init_workers(&fs_info->delayed_workers, "delayed-meta",

			   fs_info->thread_pool_size,

			   &fs_info->generic_worker);

	btrfs_init_workers(&fs_info->readahead_workers, "readahead",

			   fs_info->thread_pool_size,

			   &fs_info->generic_worker);



	/*

	 * endios are largely parallel and should have a very
@@ -2113,6 +2189,7 @@ struct btrfs_root *open_ctree(struct super_block *sb, 


	fs_info->endio_write_workers.idle_thresh = 2;

	fs_info->endio_meta_write_workers.idle_thresh = 2;

	fs_info->readahead_workers.idle_thresh = 2;



	btrfs_start_workers(&fs_info->workers, 1);

	btrfs_start_workers(&fs_info->generic_worker, 1);
@@ -2126,6 +2203,7 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
	btrfs_start_workers(&fs_info->endio_freespace_worker, 1);

	btrfs_start_workers(&fs_info->delayed_workers, 1);

	btrfs_start_workers(&fs_info->caching_workers, 1);

	btrfs_start_workers(&fs_info->readahead_workers, 1);



	fs_info->bdi.ra_pages *= btrfs_super_num_devices(disk_super);

	fs_info->bdi.ra_pages = max(fs_info->bdi.ra_pages,
@@ -2855,6 +2933,7 @@ int close_ctree(struct btrfs_root *root) 
	btrfs_stop_workers(&fs_info->submit_workers);

	btrfs_stop_workers(&fs_info->delayed_workers);

	btrfs_stop_workers(&fs_info->caching_workers);

	btrfs_stop_workers(&fs_info->readahead_workers);



	btrfs_close_devices(fs_info->fs_devices);

	btrfs_mapping_tree_free(&fs_info->mapping_tree);
@@ -3363,6 +3442,7 @@ static int btrfs_cleanup_transaction(struct btrfs_root *root) 
static struct extent_io_ops btree_extent_io_ops = {

	.write_cache_pages_lock_hook = btree_lock_page_hook,

	.readpage_end_io_hook = btree_readpage_end_io_hook,

	.readpage_io_failed_hook = btree_io_failed_hook,

	.submit_bio_hook = btree_submit_bio_hook,

	/* note we're sharing with inode.c for the merge bio hook */

	.merge_bio_hook = btrfs_merge_bio_hook,

fs/btrfs/disk-io.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr, 
				      u32 blocksize, u64 parent_transid);

int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize,

			 u64 parent_transid);

int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,

			 int mirror_num, struct extent_buffer **eb);

struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,

						   u64 bytenr, u32 blocksize);

int clean_tree_block(struct btrfs_trans_handle *trans,

fs/btrfs/extent_io.c

+4 −5
Original line number Diff line number Diff line
@@ -1919,7 +1919,7 @@ static void end_bio_extent_readpage(struct bio *bio, int err) 
		if (!uptodate && tree->ops &&

		    tree->ops->readpage_io_failed_hook) {

			ret = tree->ops->readpage_io_failed_hook(bio, page,

							 start, end, NULL);

							 start, end, state);

			if (ret == 0) {

				uptodate =

					test_bit(BIO_UPTODATE, &bio->bi_flags);
@@ -3551,8 +3551,7 @@ int extent_buffer_uptodate(struct extent_io_tree *tree, 
}



int read_extent_buffer_pages(struct extent_io_tree *tree,

			     struct extent_buffer *eb,

			     u64 start, int wait,

			     struct extent_buffer *eb, u64 start, int wait,

			     get_extent_t *get_extent, int mirror_num)

{

	unsigned long i;
@@ -3588,7 +3587,7 @@ int read_extent_buffer_pages(struct extent_io_tree *tree, 
	num_pages = num_extent_pages(eb->start, eb->len);

	for (i = start_i; i < num_pages; i++) {

		page = extent_buffer_page(eb, i);

		if (!wait) {

		if (wait == WAIT_NONE) {

			if (!trylock_page(page))

				goto unlock_exit;

		} else {
@@ -3632,7 +3631,7 @@ int read_extent_buffer_pages(struct extent_io_tree *tree, 
	if (bio)

		submit_one_bio(READ, bio, mirror_num, bio_flags);



	if (ret || !wait)

	if (ret || wait != WAIT_COMPLETE)

		return ret;



	for (i = start_i; i < num_pages; i++) {