Commit 90d0c376 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs updates from Chris Mason:
 "The largest set of changes here come from Miao Xie.  He's cleaning up
  and improving read recovery/repair for raid, and has a number of
  related fixes.

  I've merged another set of fsync fixes from Filipe, and he's also
  improved the way we handle metadata write errors to make sure we force
  the FS readonly if things go wrong.

  Otherwise we have a collection of fixes and cleanups.  Dave Sterba
  gets a cookie for removing the most lines (thanks Dave)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (139 commits)
  btrfs: Fix compile error when CONFIG_SECURITY is not set.
  Btrfs: fix compiles when CONFIG_BTRFS_FS_RUN_SANITY_TESTS is off
  btrfs: Make btrfs handle security mount options internally to avoid losing security label.
  Btrfs: send, don't delay dir move if there's a new parent inode
  btrfs: add more superblock checks
  Btrfs: fix race in WAIT_SYNC ioctl
  Btrfs: be aware of btree inode write errors to avoid fs corruption
  Btrfs: remove redundant btrfs_verify_qgroup_counts declaration.
  btrfs: fix shadow warning on cmp
  Btrfs: fix compilation errors under DEBUG
  Btrfs: fix crash of btrfs_release_extent_buffer_page
  Btrfs: add missing end_page_writeback on submit_extent_page failure
  btrfs: Fix the wrong condition judgment about subset extent map
  Btrfs: fix build_backref_tree issue with multiple shared blocks
  Btrfs: cleanup error handling in build_backref_tree
  btrfs: move checks for DUMMY_ROOT into a helper
  btrfs: new define for the inline extent data start
  btrfs: kill extent_buffer_page helper
  btrfs: drop constant param from btrfs_release_extent_buffer_page
  btrfs: hide typecast to definition of BTRFS_SEND_TRANS_STUB
  ...
parents ac0c4939 a43bb39b

fs/btrfs/async-thread.c

+6 −5
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ BTRFS_WORK_HELPER(endio_helper); 
BTRFS_WORK_HELPER(endio_meta_helper);

BTRFS_WORK_HELPER(endio_meta_write_helper);

BTRFS_WORK_HELPER(endio_raid56_helper);

BTRFS_WORK_HELPER(endio_repair_helper);

BTRFS_WORK_HELPER(rmw_helper);

BTRFS_WORK_HELPER(endio_write_helper);

BTRFS_WORK_HELPER(freespace_write_helper);
@@ -91,7 +92,7 @@ __btrfs_alloc_workqueue(const char *name, int flags, int max_active, 
{

	struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS);



	if (unlikely(!ret))

	if (!ret)

		return NULL;



	ret->max_active = max_active;
@@ -115,7 +116,7 @@ __btrfs_alloc_workqueue(const char *name, int flags, int max_active, 
		ret->normal_wq = alloc_workqueue("%s-%s", flags,

						 ret->max_active, "btrfs",

						 name);

	if (unlikely(!ret->normal_wq)) {

	if (!ret->normal_wq) {

		kfree(ret);

		return NULL;

	}
@@ -137,12 +138,12 @@ struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, 
{

	struct btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS);



	if (unlikely(!ret))

	if (!ret)

		return NULL;



	ret->normal = __btrfs_alloc_workqueue(name, flags & ~WQ_HIGHPRI,

					      max_active, thresh);

	if (unlikely(!ret->normal)) {

	if (!ret->normal) {

		kfree(ret);

		return NULL;

	}
@@ -150,7 +151,7 @@ struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, 
	if (flags & WQ_HIGHPRI) {

		ret->high = __btrfs_alloc_workqueue(name, flags, max_active,

						    thresh);

		if (unlikely(!ret->high)) {

		if (!ret->high) {

			__btrfs_destroy_workqueue(ret->normal);

			kfree(ret);

			return NULL;

fs/btrfs/async-thread.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ BTRFS_WORK_HELPER_PROTO(endio_helper); 
BTRFS_WORK_HELPER_PROTO(endio_meta_helper);

BTRFS_WORK_HELPER_PROTO(endio_meta_write_helper);

BTRFS_WORK_HELPER_PROTO(endio_raid56_helper);

BTRFS_WORK_HELPER_PROTO(endio_repair_helper);

BTRFS_WORK_HELPER_PROTO(rmw_helper);

BTRFS_WORK_HELPER_PROTO(endio_write_helper);

BTRFS_WORK_HELPER_PROTO(freespace_write_helper);

fs/btrfs/backref.c

+104 −19
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
#include "delayed-ref.h"

#include "locking.h"



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

#define BACKREF_FOUND_SHARED 6



struct extent_inode_elem {

	u64 inum;

	u64 offset;
@@ -377,7 +380,8 @@ out: 
static int __resolve_indirect_refs(struct btrfs_fs_info *fs_info,

				   struct btrfs_path *path, u64 time_seq,

				   struct list_head *head,

				   const u64 *extent_item_pos, u64 total_refs)

				   const u64 *extent_item_pos, u64 total_refs,

				   u64 root_objectid)

{

	int err;

	int ret = 0;
@@ -402,6 +406,10 @@ static int __resolve_indirect_refs(struct btrfs_fs_info *fs_info, 
			continue;

		if (ref->count == 0)

			continue;

		if (root_objectid && ref->root_id != root_objectid) {

			ret = BACKREF_FOUND_SHARED;

			goto out;

		}

		err = __resolve_indirect_ref(fs_info, path, time_seq, ref,

					     parents, extent_item_pos,

					     total_refs);
@@ -482,7 +490,7 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info, 
			continue;

		BUG_ON(!ref->wanted_disk_byte);

		eb = read_tree_block(fs_info->tree_root, ref->wanted_disk_byte,

				     fs_info->tree_root->leafsize, 0);

				     0);

		if (!eb || !extent_buffer_uptodate(eb)) {

			free_extent_buffer(eb);

			return -EIO;
@@ -561,7 +569,8 @@ static void __merge_refs(struct list_head *head, int mode) 
 * smaller or equal that seq to the list

 */

static int __add_delayed_refs(struct btrfs_delayed_ref_head *head, u64 seq,

			      struct list_head *prefs, u64 *total_refs)

			      struct list_head *prefs, u64 *total_refs,

			      u64 inum)

{

	struct btrfs_delayed_extent_op *extent_op = head->extent_op;

	struct rb_node *n = &head->node.rb_node;
@@ -625,6 +634,16 @@ static int __add_delayed_refs(struct btrfs_delayed_ref_head *head, u64 seq, 
			key.objectid = ref->objectid;

			key.type = BTRFS_EXTENT_DATA_KEY;

			key.offset = ref->offset;



			/*

			 * Found a inum that doesn't match our known inum, we

			 * know it's shared.

			 */

			if (inum && ref->objectid != inum) {

				ret = BACKREF_FOUND_SHARED;

				break;

			}



			ret = __add_prelim_ref(prefs, ref->root, &key, 0, 0,

					       node->bytenr,

					       node->ref_mod * sgn, GFP_ATOMIC);
@@ -659,7 +678,7 @@ static int __add_delayed_refs(struct btrfs_delayed_ref_head *head, u64 seq, 
static int __add_inline_refs(struct btrfs_fs_info *fs_info,

			     struct btrfs_path *path, u64 bytenr,

			     int *info_level, struct list_head *prefs,

			     u64 *total_refs)

			     u64 *total_refs, u64 inum)

{

	int ret = 0;

	int slot;
@@ -744,6 +763,12 @@ static int __add_inline_refs(struct btrfs_fs_info *fs_info, 
								      dref);

			key.type = BTRFS_EXTENT_DATA_KEY;

			key.offset = btrfs_extent_data_ref_offset(leaf, dref);



			if (inum && key.objectid != inum) {

				ret = BACKREF_FOUND_SHARED;

				break;

			}



			root = btrfs_extent_data_ref_root(leaf, dref);

			ret = __add_prelim_ref(prefs, root, &key, 0, 0,

					       bytenr, count, GFP_NOFS);
@@ -765,7 +790,7 @@ static int __add_inline_refs(struct btrfs_fs_info *fs_info, 
 */

static int __add_keyed_refs(struct btrfs_fs_info *fs_info,

			    struct btrfs_path *path, u64 bytenr,

			    int info_level, struct list_head *prefs)

			    int info_level, struct list_head *prefs, u64 inum)

{

	struct btrfs_root *extent_root = fs_info->extent_root;

	int ret;
@@ -827,6 +852,12 @@ static int __add_keyed_refs(struct btrfs_fs_info *fs_info, 
								      dref);

			key.type = BTRFS_EXTENT_DATA_KEY;

			key.offset = btrfs_extent_data_ref_offset(leaf, dref);



			if (inum && key.objectid != inum) {

				ret = BACKREF_FOUND_SHARED;

				break;

			}



			root = btrfs_extent_data_ref_root(leaf, dref);

			ret = __add_prelim_ref(prefs, root, &key, 0, 0,

					       bytenr, count, GFP_NOFS);
@@ -854,7 +885,8 @@ static int __add_keyed_refs(struct btrfs_fs_info *fs_info, 
static int find_parent_nodes(struct btrfs_trans_handle *trans,

			     struct btrfs_fs_info *fs_info, u64 bytenr,

			     u64 time_seq, struct ulist *refs,

			     struct ulist *roots, const u64 *extent_item_pos)

			     struct ulist *roots, const u64 *extent_item_pos,

			     u64 root_objectid, u64 inum)

{

	struct btrfs_key key;

	struct btrfs_path *path;
@@ -929,7 +961,8 @@ again: 
			}

			spin_unlock(&delayed_refs->lock);

			ret = __add_delayed_refs(head, time_seq,

						 &prefs_delayed, &total_refs);

						 &prefs_delayed, &total_refs,

						 inum);

			mutex_unlock(&head->mutex);

			if (ret)

				goto out;
@@ -951,11 +984,11 @@ again: 
		     key.type == BTRFS_METADATA_ITEM_KEY)) {

			ret = __add_inline_refs(fs_info, path, bytenr,

						&info_level, &prefs,

						&total_refs);

						&total_refs, inum);

			if (ret)

				goto out;

			ret = __add_keyed_refs(fs_info, path, bytenr,

					       info_level, &prefs);

					       info_level, &prefs, inum);

			if (ret)

				goto out;

		}
@@ -971,7 +1004,8 @@ again: 
	__merge_refs(&prefs, 1);



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

				      extent_item_pos, total_refs);

				      extent_item_pos, total_refs,

				      root_objectid);

	if (ret)

		goto out;
@@ -981,6 +1015,11 @@ again: 
		ref = list_first_entry(&prefs, struct __prelim_ref, list);

		WARN_ON(ref->count < 0);

		if (roots && ref->count && ref->root_id && ref->parent == 0) {

			if (root_objectid && ref->root_id != root_objectid) {

				ret = BACKREF_FOUND_SHARED;

				goto out;

			}



			/* no parent == root of tree */

			ret = ulist_add(roots, ref->root_id, 0, GFP_NOFS);

			if (ret < 0)
@@ -989,12 +1028,10 @@ again: 
		if (ref->count && ref->parent) {

			if (extent_item_pos && !ref->inode_list &&

			    ref->level == 0) {

				u32 bsz;

				struct extent_buffer *eb;

				bsz = btrfs_level_size(fs_info->extent_root,

							ref->level);



				eb = read_tree_block(fs_info->extent_root,

							   ref->parent, bsz, 0);

							   ref->parent, 0);

				if (!eb || !extent_buffer_uptodate(eb)) {

					free_extent_buffer(eb);

					ret = -EIO;
@@ -1087,7 +1124,7 @@ static int btrfs_find_all_leafs(struct btrfs_trans_handle *trans, 
		return -ENOMEM;



	ret = find_parent_nodes(trans, fs_info, bytenr,

				time_seq, *leafs, NULL, extent_item_pos);

				time_seq, *leafs, NULL, extent_item_pos, 0, 0);

	if (ret < 0 && ret != -ENOENT) {

		free_leaf_list(*leafs);

		return ret;
@@ -1130,7 +1167,7 @@ static int __btrfs_find_all_roots(struct btrfs_trans_handle *trans, 
	ULIST_ITER_INIT(&uiter);

	while (1) {

		ret = find_parent_nodes(trans, fs_info, bytenr,

					time_seq, tmp, *roots, NULL);

					time_seq, tmp, *roots, NULL, 0, 0);

		if (ret < 0 && ret != -ENOENT) {

			ulist_free(tmp);

			ulist_free(*roots);
@@ -1161,6 +1198,54 @@ int btrfs_find_all_roots(struct btrfs_trans_handle *trans, 
	return ret;

}



int btrfs_check_shared(struct btrfs_trans_handle *trans,

		       struct btrfs_fs_info *fs_info, u64 root_objectid,

		       u64 inum, u64 bytenr)

{

	struct ulist *tmp = NULL;

	struct ulist *roots = NULL;

	struct ulist_iterator uiter;

	struct ulist_node *node;

	struct seq_list elem = {};

	int ret = 0;



	tmp = ulist_alloc(GFP_NOFS);

	roots = ulist_alloc(GFP_NOFS);

	if (!tmp || !roots) {

		ulist_free(tmp);

		ulist_free(roots);

		return -ENOMEM;

	}



	if (trans)

		btrfs_get_tree_mod_seq(fs_info, &elem);

	else

		down_read(&fs_info->commit_root_sem);

	ULIST_ITER_INIT(&uiter);

	while (1) {

		ret = find_parent_nodes(trans, fs_info, bytenr, elem.seq, tmp,

					roots, NULL, root_objectid, inum);

		if (ret == BACKREF_FOUND_SHARED) {

			ret = 1;

			break;

		}

		if (ret < 0 && ret != -ENOENT)

			break;

		node = ulist_next(tmp, &uiter);

		if (!node)

			break;

		bytenr = node->val;

		cond_resched();

	}

	if (trans)

		btrfs_put_tree_mod_seq(fs_info, &elem);

	else

		up_read(&fs_info->commit_root_sem);

	ulist_free(tmp);

	ulist_free(roots);

	return ret;

}



/*

 * this makes the path point to (inum INODE_ITEM ioff)

 */
@@ -1193,7 +1278,7 @@ int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid, 
	unsigned long ptr;



	key.objectid = inode_objectid;

	btrfs_set_key_type(&key, BTRFS_INODE_EXTREF_KEY);

	key.type = BTRFS_INODE_EXTREF_KEY;

	key.offset = start_off;



	ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
@@ -1233,7 +1318,7 @@ int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid, 
		ret = -ENOENT;

		if (found_key.objectid != inode_objectid)

			break;

		if (btrfs_key_type(&found_key) != BTRFS_INODE_EXTREF_KEY)

		if (found_key.type != BTRFS_INODE_EXTREF_KEY)

			break;



		ret = 0;
@@ -1366,7 +1451,7 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, 
	}

	btrfs_item_key_to_cpu(path->nodes[0], found_key, path->slots[0]);

	if (found_key->type == BTRFS_METADATA_ITEM_KEY)

		size = fs_info->extent_root->leafsize;

		size = fs_info->extent_root->nodesize;

	else if (found_key->type == BTRFS_EXTENT_ITEM_KEY)

		size = found_key->offset;

fs/btrfs/backref.h

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid, 
			  u64 start_off, struct btrfs_path *path,

			  struct btrfs_inode_extref **ret_extref,

			  u64 *found_off);

int btrfs_check_shared(struct btrfs_trans_handle *trans,

		       struct btrfs_fs_info *fs_info, u64 root_objectid,

		       u64 inum, u64 bytenr);



int __init btrfs_prelim_ref_init(void);

void btrfs_prelim_ref_exit(void);

fs/btrfs/btrfs_inode.h

+26 −1
Original line number Diff line number Diff line
@@ -44,6 +44,17 @@ 
#define BTRFS_INODE_IN_DELALLOC_LIST		9

#define BTRFS_INODE_READDIO_NEED_LOCK		10

#define BTRFS_INODE_HAS_PROPS		        11

/*

 * The following 3 bits are meant only for the btree inode.

 * When any of them is set, it means an error happened while writing an

 * extent buffer belonging to:

 * 1) a non-log btree

 * 2) a log btree and first log sub-transaction

 * 3) a log btree and second log sub-transaction

 */

#define BTRFS_INODE_BTREE_ERR		        12

#define BTRFS_INODE_BTREE_LOG1_ERR		13

#define BTRFS_INODE_BTREE_LOG2_ERR		14



/* in memory btrfs inode */

struct btrfs_inode {
@@ -120,6 +131,12 @@ struct btrfs_inode { 
	 */

	u64 delalloc_bytes;



	/*

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

	 * it needs COW.

	 */

	u64 defrag_bytes;



	/*

	 * the size of the file stored in the metadata on disk.  data=ordered

	 * means the in-memory i_size might be larger than the size on disk
@@ -248,8 +265,11 @@ static inline int btrfs_inode_in_log(struct inode *inode, u64 generation) 
	return 0;

}



#define BTRFS_DIO_ORIG_BIO_SUBMITTED	0x1



struct btrfs_dio_private {

	struct inode *inode;

	unsigned long flags;

	u64 logical_offset;

	u64 disk_bytenr;

	u64 bytes;
@@ -266,7 +286,12 @@ struct btrfs_dio_private { 


	/* dio_bio came from fs/direct-io.c */

	struct bio *dio_bio;

	u8 csum[0];



	/*

	 * The original bio may be splited to several sub-bios, this is

	 * done during endio of sub-bios

	 */

	int (*subio_endio)(struct inode *, struct btrfs_io_bio *, int);

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE