Commit 1176032c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs 

Pull btrfs updates from Chris Mason:
 "This has fixes and cleanups Dave Sterba collected for the merge
  window.

  The biggest functional fixes are between btrfs raid5/6 and scrub, and
  raid5/6 and device replacement. Some of our pending qgroup fixes are
  included as well while I bash on the rest in testing.

  We also have the usual set of cleanups, including one that makes
  __btrfs_map_block() much more maintainable, and conversions from
  atomic_t to refcount_t"

* 'for-linus-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (71 commits)
  btrfs: fix the gfp_mask for the reada_zones radix tree
  Btrfs: fix reported number of inode blocks
  Btrfs: send, fix file hole not being preserved due to inline extent
  Btrfs: fix extent map leak during fallocate error path
  Btrfs: fix incorrect space accounting after failure to insert inline extent
  Btrfs: fix invalid attempt to free reserved space on failure to cow range
  btrfs: Handle delalloc error correctly to avoid ordered extent hang
  btrfs: Fix metadata underflow caused by btrfs_reloc_clone_csum error
  btrfs: check if the device is flush capable
  btrfs: delete unused member nobarriers
  btrfs: scrub: Fix RAID56 recovery race condition
  btrfs: scrub: Introduce full stripe lock for RAID56
  btrfs: Use ktime_get_real_ts for root ctime
  Btrfs: handle only applicable errors returned by btrfs_get_extent
  btrfs: qgroup: Fix qgroup corruption caused by inode_cache mount option
  btrfs: use q which is already obtained from bdev_get_queue
  Btrfs: switch to div64_u64 if with a u64 divisor
  Btrfs: update scrub_parity to use u64 stripe_len
  Btrfs: enable repair during read for raid56 profile
  btrfs: use clear_page where appropriate
  ...
parents 56868a46 9bcaaea7

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -2926,6 +2926,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git 
S:	Maintained

F:	Documentation/filesystems/btrfs.txt

F:	fs/btrfs/

F:	include/linux/btrfs*

F:	include/uapi/linux/btrfs*



BTTV VIDEO4LINUX DRIVER

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

fs/btrfs/backref.c

+22 −19
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ 
#include "delayed-ref.h"

#include "locking.h"



enum merge_mode {

	MERGE_IDENTICAL_KEYS = 1,

	MERGE_IDENTICAL_PARENTS,

};



/* Just an arbitrary number so we can be sure this happened */

#define BACKREF_FOUND_SHARED 6
@@ -533,7 +538,7 @@ static int add_all_parents(struct btrfs_root *root, struct btrfs_path *path, 
	 * slot==nritems. In that case, go to the next leaf before we continue.

	 */

	if (path->slots[0] >= btrfs_header_nritems(path->nodes[0])) {

		if (time_seq == (u64)-1)

		if (time_seq == SEQ_LAST)

			ret = btrfs_next_leaf(root, path);

		else

			ret = btrfs_next_old_leaf(root, path, time_seq);
@@ -577,7 +582,7 @@ static int add_all_parents(struct btrfs_root *root, struct btrfs_path *path, 
			eie = NULL;

		}

next:

		if (time_seq == (u64)-1)

		if (time_seq == SEQ_LAST)

			ret = btrfs_next_item(root, path);

		else

			ret = btrfs_next_old_item(root, path, time_seq);
@@ -629,7 +634,7 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info, 


	if (path->search_commit_root)

		root_level = btrfs_header_level(root->commit_root);

	else if (time_seq == (u64)-1)

	else if (time_seq == SEQ_LAST)

		root_level = btrfs_header_level(root->node);

	else

		root_level = btrfs_old_root_level(root, time_seq);
@@ -640,7 +645,7 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info, 
	}



	path->lowest_level = level;

	if (time_seq == (u64)-1)

	if (time_seq == SEQ_LAST)

		ret = btrfs_search_slot(NULL, root, &ref->key_for_search, path,

					0, 0);

	else
@@ -809,14 +814,12 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info, 
/*

 * merge backrefs and adjust counts accordingly

 *

 * mode = 1: merge identical keys, if key is set

 *    FIXME: if we add more keys in __add_prelim_ref, we can merge more here.

 *           additionally, we could even add a key range for the blocks we

 *           looked into to merge even more (-> replace unresolved refs by those

 *           having a parent).

 * mode = 2: merge identical parents

 *    FIXME: For MERGE_IDENTICAL_KEYS, if we add more keys in __add_prelim_ref

 *           then we can merge more here. Additionally, we could even add a key

 *           range for the blocks we looked into to merge even more (-> replace

 *           unresolved refs by those having a parent).

 */

static void __merge_refs(struct list_head *head, int mode)

static void __merge_refs(struct list_head *head, enum merge_mode mode)

{

	struct __prelim_ref *pos1;
@@ -829,7 +832,7 @@ static void __merge_refs(struct list_head *head, int mode) 


			if (!ref_for_same_block(ref1, ref2))

				continue;

			if (mode == 1) {

			if (mode == MERGE_IDENTICAL_KEYS) {

				if (!ref1->parent && ref2->parent)

					swap(ref1, ref2);

			} else {
@@ -1196,7 +1199,7 @@ static int __add_keyed_refs(struct btrfs_fs_info *fs_info, 
 *

 * NOTE: This can return values > 0

 *

 * If time_seq is set to (u64)-1, it will not search delayed_refs, and behave

 * If time_seq is set to SEQ_LAST, it will not search delayed_refs, and behave

 * much like trans == NULL case, the difference only lies in it will not

 * commit root.

 * The special case is for qgroup to search roots in commit_transaction().
@@ -1243,7 +1246,7 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, 
		path->skip_locking = 1;

	}



	if (time_seq == (u64)-1)

	if (time_seq == SEQ_LAST)

		path->skip_locking = 1;



	/*
@@ -1273,9 +1276,9 @@ again: 


#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

	if (trans && likely(trans->type != __TRANS_DUMMY) &&

	    time_seq != (u64)-1) {

	    time_seq != SEQ_LAST) {

#else

	if (trans && time_seq != (u64)-1) {

	if (trans && time_seq != SEQ_LAST) {

#endif

		/*

		 * look if there are updates for this ref queued and lock the
@@ -1286,7 +1289,7 @@ again: 
		head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);

		if (head) {

			if (!mutex_trylock(&head->mutex)) {

				atomic_inc(&head->node.refs);

				refcount_inc(&head->node.refs);

				spin_unlock(&delayed_refs->lock);



				btrfs_release_path(path);
@@ -1374,7 +1377,7 @@ again: 
	if (ret)

		goto out;



	__merge_refs(&prefs, 1);

	__merge_refs(&prefs, MERGE_IDENTICAL_KEYS);



	ret = __resolve_indirect_refs(fs_info, path, time_seq, &prefs,

				      extent_item_pos, total_refs,
@@ -1382,7 +1385,7 @@ again: 
	if (ret)

		goto out;



	__merge_refs(&prefs, 2);

	__merge_refs(&prefs, MERGE_IDENTICAL_PARENTS);



	while (!list_empty(&prefs)) {

		ref = list_first_entry(&prefs, struct __prelim_ref, list);

fs/btrfs/btrfs_inode.h

+7 −0
Original line number Diff line number Diff line
@@ -124,6 +124,13 @@ struct btrfs_inode { 
	 */

	u64 delalloc_bytes;



	/*

	 * Total number of bytes pending delalloc that fall within a file

	 * range that is either a hole or beyond EOF (and no prealloc extent

	 * exists in the range). This is always <= delalloc_bytes.

	 */

	u64 new_delalloc_bytes;



	/*

	 * total number of bytes pending defrag, used by stat to check whether

	 * it needs COW.

fs/btrfs/compression.c

+9 −9
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 


struct compressed_bio {

	/* number of bios pending for this compressed extent */

	atomic_t pending_bios;

	refcount_t pending_bios;



	/* the pages with the compressed data on them */

	struct page **compressed_pages;
@@ -161,7 +161,7 @@ static void end_compressed_bio_read(struct bio *bio) 
	/* if there are more bios still pending for this compressed

	 * extent, just exit

	 */

	if (!atomic_dec_and_test(&cb->pending_bios))

	if (!refcount_dec_and_test(&cb->pending_bios))

		goto out;



	inode = cb->inode;
@@ -274,7 +274,7 @@ static void end_compressed_bio_write(struct bio *bio) 
	/* if there are more bios still pending for this compressed

	 * extent, just exit

	 */

	if (!atomic_dec_and_test(&cb->pending_bios))

	if (!refcount_dec_and_test(&cb->pending_bios))

		goto out;



	/* ok, we're the last bio for this extent, step one is to
@@ -342,7 +342,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
	cb = kmalloc(compressed_bio_size(fs_info, compressed_len), GFP_NOFS);

	if (!cb)

		return -ENOMEM;

	atomic_set(&cb->pending_bios, 0);

	refcount_set(&cb->pending_bios, 0);

	cb->errors = 0;

	cb->inode = inode;

	cb->start = start;
@@ -363,7 +363,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
	bio_set_op_attrs(bio, REQ_OP_WRITE, 0);

	bio->bi_private = cb;

	bio->bi_end_io = end_compressed_bio_write;

	atomic_inc(&cb->pending_bios);

	refcount_set(&cb->pending_bios, 1);



	/* create and submit bios for the compressed pages */

	bytes_left = compressed_len;
@@ -388,7 +388,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
			 * we inc the count.  Otherwise, the cb might get

			 * freed before we're done setting it up

			 */

			atomic_inc(&cb->pending_bios);

			refcount_inc(&cb->pending_bios);

			ret = btrfs_bio_wq_end_io(fs_info, bio,

						  BTRFS_WQ_ENDIO_DATA);

			BUG_ON(ret); /* -ENOMEM */
@@ -607,7 +607,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	if (!cb)

		goto out;



	atomic_set(&cb->pending_bios, 0);

	refcount_set(&cb->pending_bios, 0);

	cb->errors = 0;

	cb->inode = inode;

	cb->mirror_num = mirror_num;
@@ -656,7 +656,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	bio_set_op_attrs (comp_bio, REQ_OP_READ, 0);

	comp_bio->bi_private = cb;

	comp_bio->bi_end_io = end_compressed_bio_read;

	atomic_inc(&cb->pending_bios);

	refcount_set(&cb->pending_bios, 1);



	for (pg_index = 0; pg_index < nr_pages; pg_index++) {

		page = cb->compressed_pages[pg_index];
@@ -685,7 +685,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
			 * we inc the count.  Otherwise, the cb might get

			 * freed before we're done setting it up

			 */

			atomic_inc(&cb->pending_bios);

			refcount_inc(&cb->pending_bios);



			if (!(BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)) {

				ret = btrfs_lookup_bio_sums(inode, comp_bio,

fs/btrfs/ctree.c

+10 −10
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ tree_mod_log_insert_key(struct btrfs_fs_info *fs_info, 
static noinline int

tree_mod_log_insert_move(struct btrfs_fs_info *fs_info,

			 struct extent_buffer *eb, int dst_slot, int src_slot,

			 int nr_items, gfp_t flags)

			 int nr_items)

{

	struct tree_mod_elem *tm = NULL;

	struct tree_mod_elem **tm_list = NULL;
@@ -578,11 +578,11 @@ tree_mod_log_insert_move(struct btrfs_fs_info *fs_info, 
	if (!tree_mod_need_log(fs_info, eb))

		return 0;



	tm_list = kcalloc(nr_items, sizeof(struct tree_mod_elem *), flags);

	tm_list = kcalloc(nr_items, sizeof(struct tree_mod_elem *), GFP_NOFS);

	if (!tm_list)

		return -ENOMEM;



	tm = kzalloc(sizeof(*tm), flags);

	tm = kzalloc(sizeof(*tm), GFP_NOFS);

	if (!tm) {

		ret = -ENOMEM;

		goto free_tms;
@@ -596,7 +596,7 @@ tree_mod_log_insert_move(struct btrfs_fs_info *fs_info, 


	for (i = 0; i + dst_slot < src_slot && i < nr_items; i++) {

		tm_list[i] = alloc_tree_mod_elem(eb, i + dst_slot,

		    MOD_LOG_KEY_REMOVE_WHILE_MOVING, flags);

		    MOD_LOG_KEY_REMOVE_WHILE_MOVING, GFP_NOFS);

		if (!tm_list[i]) {

			ret = -ENOMEM;

			goto free_tms;
@@ -663,7 +663,7 @@ __tree_mod_log_free_eb(struct btrfs_fs_info *fs_info, 
static noinline int

tree_mod_log_insert_root(struct btrfs_fs_info *fs_info,

			 struct extent_buffer *old_root,

			 struct extent_buffer *new_root, gfp_t flags,

			 struct extent_buffer *new_root,

			 int log_removal)

{

	struct tree_mod_elem *tm = NULL;
@@ -678,14 +678,14 @@ tree_mod_log_insert_root(struct btrfs_fs_info *fs_info, 
	if (log_removal && btrfs_header_level(old_root) > 0) {

		nritems = btrfs_header_nritems(old_root);

		tm_list = kcalloc(nritems, sizeof(struct tree_mod_elem *),

				  flags);

				  GFP_NOFS);

		if (!tm_list) {

			ret = -ENOMEM;

			goto free_tms;

		}

		for (i = 0; i < nritems; i++) {

			tm_list[i] = alloc_tree_mod_elem(old_root, i,

			    MOD_LOG_KEY_REMOVE_WHILE_FREEING, flags);

			    MOD_LOG_KEY_REMOVE_WHILE_FREEING, GFP_NOFS);

			if (!tm_list[i]) {

				ret = -ENOMEM;

				goto free_tms;
@@ -693,7 +693,7 @@ tree_mod_log_insert_root(struct btrfs_fs_info *fs_info, 
		}

	}



	tm = kzalloc(sizeof(*tm), flags);

	tm = kzalloc(sizeof(*tm), GFP_NOFS);

	if (!tm) {

		ret = -ENOMEM;

		goto free_tms;
@@ -873,7 +873,7 @@ tree_mod_log_eb_move(struct btrfs_fs_info *fs_info, struct extent_buffer *dst, 
{

	int ret;

	ret = tree_mod_log_insert_move(fs_info, dst, dst_offset, src_offset,

				       nr_items, GFP_NOFS);

				       nr_items);

	BUG_ON(ret < 0);

}
@@ -943,7 +943,7 @@ tree_mod_log_set_root_pointer(struct btrfs_root *root, 
{

	int ret;

	ret = tree_mod_log_insert_root(root->fs_info, root->node,

				       new_root_node, GFP_NOFS, log_removal);

				       new_root_node, log_removal);

	BUG_ON(ret < 0);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE