Commit 0fbf2cc9 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 fixes from Chris Mason:
 "These are mostly bug fixes and a two small performance fixes.  The
  most important of the bunch are Josef's fix for a snapshotting
  regression and Mark's update to fix compile problems on arm"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (25 commits)
  Btrfs: create the uuid tree on remount rw
  btrfs: change extent-same to copy entire argument struct
  Btrfs: dir_inode_operations should use btrfs_update_time also
  btrfs: Add btrfs: prefix to kernel log output
  btrfs: refuse to remount read-write after abort
  Btrfs: btrfs_ioctl_default_subvol: Revert back to toplevel subvolume when arg is 0
  Btrfs: don't leak transaction in btrfs_sync_file()
  Btrfs: add the missing mutex unlock in write_all_supers()
  Btrfs: iput inode on allocation failure
  Btrfs: remove space_info->reservation_progress
  Btrfs: kill delay_iput arg to the wait_ordered functions
  Btrfs: fix worst case calculator for space usage
  Revert "Btrfs: rework the overcommit logic to be based on the total size"
  Btrfs: improve replacing nocow extents
  Btrfs: drop dir i_size when adding new names on replay
  Btrfs: replay dir_index items before other items
  Btrfs: check roots last log commit when checking if an inode has been logged
  Btrfs: actually log directory we are fsync()'ing
  Btrfs: actually limit the size of delalloc range
  Btrfs: allocate the free space by the existed max extent size when ENOSPC
  ...
parents c43a3855 94aebfb2

fs/btrfs/btrfs_inode.h

+4 −1
Original line number Diff line number Diff line
@@ -213,7 +213,10 @@ static inline bool btrfs_is_free_space_inode(struct inode *inode) 
static inline int btrfs_inode_in_log(struct inode *inode, u64 generation)

{

	if (BTRFS_I(inode)->logged_trans == generation &&

	    BTRFS_I(inode)->last_sub_trans <= BTRFS_I(inode)->last_log_commit)

	    BTRFS_I(inode)->last_sub_trans <=

	    BTRFS_I(inode)->last_log_commit &&

	    BTRFS_I(inode)->last_sub_trans <=

	    BTRFS_I(inode)->root->last_log_commit)

		return 1;

	return 0;

}

fs/btrfs/ctree.c

+5 −2
Original line number Diff line number Diff line
@@ -1005,8 +1005,11 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, 
		return ret;

	}



	if (root->ref_cows)

		btrfs_reloc_cow_block(trans, root, buf, cow);

	if (root->ref_cows) {

		ret = btrfs_reloc_cow_block(trans, root, buf, cow);

		if (ret)

			return ret;

	}



	if (buf == root->node) {

		WARN_ON(parent && parent != buf);

fs/btrfs/ctree.h

+4 −13
Original line number Diff line number Diff line
@@ -1118,15 +1118,6 @@ struct btrfs_space_info { 
	 */

	struct percpu_counter total_bytes_pinned;



	/*

	 * we bump reservation progress every time we decrement

	 * bytes_reserved.  This way people waiting for reservations

	 * know something good has happened and they can check

	 * for progress.  The number here isn't to be trusted, it

	 * just shows reclaim activity

	 */

	unsigned long reservation_progress;



	unsigned int full:1;	/* indicates that we cannot allocate any more

				   chunks for this space */

	unsigned int chunk_alloc:1;	/* set if we are allocating a chunk */
@@ -3135,7 +3126,7 @@ static inline u64 btrfs_calc_trans_metadata_size(struct btrfs_root *root, 
						 unsigned num_items)

{

	return (root->leafsize + root->nodesize * (BTRFS_MAX_LEVEL - 1)) *

		3 * num_items;

		2 * num_items;

}



/*
@@ -3939,7 +3930,7 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans, 
			    struct btrfs_root *root);

int btrfs_recover_relocation(struct btrfs_root *root);

int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len);

void btrfs_reloc_cow_block(struct btrfs_trans_handle *trans,

int btrfs_reloc_cow_block(struct btrfs_trans_handle *trans,

			  struct btrfs_root *root, struct extent_buffer *buf,

			  struct extent_buffer *cow);

void btrfs_reloc_pre_snapshot(struct btrfs_trans_handle *trans,

fs/btrfs/dev-replace.c

+2 −2
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, 
	args->result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR;

	btrfs_dev_replace_unlock(dev_replace);



	btrfs_wait_all_ordered_extents(root->fs_info, 0);

	btrfs_wait_all_ordered_extents(root->fs_info);



	/* force writing the updated state information to disk */

	trans = btrfs_start_transaction(root, 0);
@@ -475,7 +475,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
		mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);

		return ret;

	}

	btrfs_wait_all_ordered_extents(root->fs_info, 0);

	btrfs_wait_all_ordered_extents(root->fs_info);



	trans = btrfs_start_transaction(root, 0);

	if (IS_ERR(trans)) {

fs/btrfs/disk-io.c

+2 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ static struct btrfs_lockdep_keyset { 
	{ .id = BTRFS_TREE_LOG_OBJECTID,	.name_stem = "log"	},

	{ .id = BTRFS_TREE_RELOC_OBJECTID,	.name_stem = "treloc"	},

	{ .id = BTRFS_DATA_RELOC_TREE_OBJECTID,	.name_stem = "dreloc"	},

	{ .id = BTRFS_UUID_TREE_OBJECTID,	.name_stem = "uuid"	},

	{ .id = 0,				.name_stem = "tree"	},

};
@@ -3415,6 +3416,7 @@ static int write_all_supers(struct btrfs_root *root, int max_mirrors) 
	if (total_errors > max_errors) {

		printk(KERN_ERR "btrfs: %d errors while writing supers\n",

		       total_errors);

		mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);



		/* FUA is masked off if unsupported and can't be the reason */

		btrfs_error(root->fs_info, -EIO,

CRA Git | Maintained and supported by SUSTech CRA and CCSE