Merge branch 'for-chris-4.11' of... (ef6ebf32) · Commits · e / devices / android_kernel_teracube_emerald

fs/btrfs/ctree.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -4159,6 +4159,9 @@ static noinline int push_for_double_split(struct btrfs_trans_handle *trans,

		/* try to push all the items before our slot into the next leaf */
		slot = path->slots[0];
		space_needed = data_size;
		if (slot > 0)
		space_needed -= btrfs_leaf_free_space(fs_info, path->nodes[0]);
		ret = push_leaf_left(trans, root, path, 1, space_needed, 0, slot);
		if (ret < 0)
		return ret;
		@@ -4214,6 +4217,10 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
		if (wret < 0)
		return wret;
		if (wret) {
		space_needed = data_size;
		if (slot > 0)
		space_needed -= btrfs_leaf_free_space(fs_info,
		l);
		wret = push_leaf_left(trans, root, path, space_needed,
		space_needed, 0, (u32)-1);
		if (wret < 0)

fs/btrfs/disk-io.c

+10 −5

Original line number	Diff line number	Diff line
		@@ -2205,11 +2205,9 @@ static void btrfs_stop_all_workers(struct btrfs_fs_info *fs_info)
		btrfs_destroy_workqueue(fs_info->delalloc_workers);
		btrfs_destroy_workqueue(fs_info->workers);
		btrfs_destroy_workqueue(fs_info->endio_workers);
		btrfs_destroy_workqueue(fs_info->endio_meta_workers);
		btrfs_destroy_workqueue(fs_info->endio_raid56_workers);
		btrfs_destroy_workqueue(fs_info->endio_repair_workers);
		btrfs_destroy_workqueue(fs_info->rmw_workers);
		btrfs_destroy_workqueue(fs_info->endio_meta_write_workers);
		btrfs_destroy_workqueue(fs_info->endio_write_workers);
		btrfs_destroy_workqueue(fs_info->endio_freespace_worker);
		btrfs_destroy_workqueue(fs_info->submit_workers);
		@@ -2219,6 +2217,13 @@ static void btrfs_stop_all_workers(struct btrfs_fs_info *fs_info)
		btrfs_destroy_workqueue(fs_info->flush_workers);
		btrfs_destroy_workqueue(fs_info->qgroup_rescan_workers);
		btrfs_destroy_workqueue(fs_info->extent_workers);
		/*
		* Now that all other work queues are destroyed, we can safely destroy
		* the queues used for metadata I/O, since tasks from those other work
		* queues can do metadata I/O operations.
		*/
		btrfs_destroy_workqueue(fs_info->endio_meta_workers);
		btrfs_destroy_workqueue(fs_info->endio_meta_write_workers);
		}

		static void free_root_extent_buffers(struct btrfs_root *root)
		@@ -3261,7 +3266,6 @@ int open_ctree(struct super_block *sb,

		fail_block_groups:
		btrfs_put_block_group_cache(fs_info);
		btrfs_free_block_groups(fs_info);

		fail_tree_roots:
		free_root_pointers(fs_info, 1);
		@@ -3269,6 +3273,7 @@ int open_ctree(struct super_block *sb,

		fail_sb_buffer:
		btrfs_stop_all_workers(fs_info);
		btrfs_free_block_groups(fs_info);
		fail_alloc:
		fail_iput:
		btrfs_mapping_tree_free(&fs_info->mapping_tree);
		@@ -3977,8 +3982,6 @@ void close_ctree(struct btrfs_fs_info *fs_info)

		btrfs_put_block_group_cache(fs_info);

		btrfs_free_block_groups(fs_info);

		/*
		* we must make sure there is not any read request to
		* submit after we stopping all workers.
		@@ -3986,6 +3989,8 @@ void close_ctree(struct btrfs_fs_info *fs_info)
		invalidate_inode_pages2(fs_info->btree_inode->i_mapping);
		btrfs_stop_all_workers(fs_info);

		btrfs_free_block_groups(fs_info);

		clear_bit(BTRFS_FS_OPEN, &fs_info->flags);
		free_root_pointers(fs_info, 1);

fs/btrfs/extent-tree.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -9740,6 +9740,11 @@ void btrfs_put_block_group_cache(struct btrfs_fs_info *info)
		}
		}

		/*
		* Must be called only after stopping all workers, since we could have block
		* group caching kthreads running, and therefore they could race with us if we
		* freed the block groups before stopping them.
		*/
		int btrfs_free_block_groups(struct btrfs_fs_info *info)
		{
		struct btrfs_block_group_cache *block_group;
		@@ -9779,9 +9784,6 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
		list_del(&block_group->list);
		up_write(&block_group->space_info->groups_sem);

		if (block_group->cached == BTRFS_CACHE_STARTED)
		wait_block_group_cache_done(block_group);

		/*
		* We haven't cached this block group, which means we could
		* possibly have excluded extents on this block group.
		@@ -9791,6 +9793,7 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
		free_excluded_extents(info, block_group);

		btrfs_remove_free_space_cache(block_group);
		ASSERT(block_group->cached != BTRFS_CACHE_STARTED);
		ASSERT(list_empty(&block_group->dirty_list));
		ASSERT(list_empty(&block_group->io_list));
		ASSERT(list_empty(&block_group->bg_list));

fs/btrfs/file-item.c

+27 −1

Original line number	Diff line number	Diff line
		@@ -643,7 +643,33 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,

		/* delete the entire item, it is inside our range */
		if (key.offset >= bytenr && csum_end <= end_byte) {
		ret = btrfs_del_item(trans, root, path);
		int del_nr = 1;

		/*
		* Check how many csum items preceding this one in this
		* leaf correspond to our range and then delete them all
		* at once.
		*/
		if (key.offset > bytenr && path->slots[0] > 0) {
		int slot = path->slots[0] - 1;

		while (slot >= 0) {
		struct btrfs_key pk;

		btrfs_item_key_to_cpu(leaf, &pk, slot);
		if (pk.offset < bytenr \|\|
		pk.type != BTRFS_EXTENT_CSUM_KEY \|\|
		pk.objectid !=
		BTRFS_EXTENT_CSUM_OBJECTID)
		break;
		path->slots[0] = slot;
		del_nr++;
		key.offset = pk.offset;
		slot--;
		}
		}
		ret = btrfs_del_items(trans, root, path,
		path->slots[0], del_nr);
		if (ret)
		goto out;
		if (key.offset == bytenr)

fs/btrfs/inode.c

+14 −15

Original line number	Diff line number	Diff line
		@@ -1331,10 +1331,16 @@ static noinline int run_delalloc_nocow(struct inode *inode,
		* either valid or do not exist.
		*/
		if (csum_exist_in_range(fs_info, disk_bytenr,
		num_bytes))
		num_bytes)) {
		if (!nolock)
		btrfs_end_write_no_snapshoting(root);
		goto out_check;
		if (!btrfs_inc_nocow_writers(fs_info, disk_bytenr))
		}
		if (!btrfs_inc_nocow_writers(fs_info, disk_bytenr)) {
		if (!nolock)
		btrfs_end_write_no_snapshoting(root);
		goto out_check;
		}
		nocow = 1;
		} else if (extent_type == BTRFS_FILE_EXTENT_INLINE) {
		extent_end = found_key.offset +
		@@ -4412,19 +4418,8 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
		if (found_type > min_type) {
		del_item = 1;
		} else {
		if (item_end < new_size) {
		/*
		* With NO_HOLES mode, for the following mapping
		*
		* [0-4k][hole][8k-12k]
		*
		* if truncating isize down to 6k, it ends up
		* isize being 8k.
		*/
		if (btrfs_fs_incompat(root->fs_info, NO_HOLES))
		last_size = new_size;
		if (item_end < new_size)
		break;
		}
		if (found_key.offset >= new_size)
		del_item = 1;
		else
		@@ -4607,8 +4602,12 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
		btrfs_abort_transaction(trans, ret);
		}
		error:
		if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID)
		if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) {
		ASSERT(last_size >= new_size);
		if (!err && last_size > new_size)
		last_size = new_size;
		btrfs_ordered_update_i_size(inode, last_size, NULL);
		}

		btrfs_free_path(path);