Commit 9f2e3a53 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs updates from David Sterba:
 "This time the majority of changes are cleanups, though there's still a
  number of changes of user interest.

  User visible changes:

   - better read time and write checks to catch errors early and before
     writing data to disk (to catch potential memory corruption on data
     that get checksummed)

   - qgroups + metadata relocation: last speed up patch int the series
     to address the slowness, there should be no overhead comparing
     balance with and without qgroups

   - FIEMAP ioctl does not start a transaction unnecessarily, this can
     result in a speed up and less blocking due to IO

   - LOGICAL_INO (v1, v2) does not start transaction unnecessarily, this
     can speed up the mentioned ioctl and scrub as well

   - fsync on files with many (but not too many) hardlinks is faster,
     finer decision if the links should be fsynced individually or
     completely

   - send tries harder to find ranges to clone

   - trim/discard will skip unallocated chunks that haven't been touched
     since the last mount

  Fixes:

   - send flushes delayed allocation before start, otherwise it could
     miss some changes in case of a very recent rw->ro switch of a
     subvolume

   - fix fallocate with qgroups that could lead to space accounting
     underflow, reported as a warning

   - trim/discard ioctl honours the requested range

   - starting send and dedupe on a subvolume at the same time will let
     only one of them succeed, this is to prevent changes that send
     could miss due to dedupe; both operations are restartable

  Core changes:

   - more tree-checker validations, errors reported by fuzzing tools:
      - device item
      - inode item
      - block group profiles

   - tracepoints for extent buffer locking

   - async cow preallocates memory to avoid errors happening too deep in
     the call chain

   - metadata reservations for delalloc reworked to better adapt in
     many-writers/low-space scenarios

   - improved space flushing logic for intense DIO vs buffered workloads

   - lots of cleanups
      - removed unused struct members
      - redundant argument removal
      - properties and xattrs
      - extent buffer locking
      - selftests
      - use common file type conversions
      - many-argument functions reduction"

* tag 'for-5.2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (227 commits)
  btrfs: Use kvmalloc for allocating compressed path context
  btrfs: Factor out common extent locking code in submit_compressed_extents
  btrfs: Set io_tree only once in submit_compressed_extents
  btrfs: Replace clear_extent_bit with unlock_extent
  btrfs: Make compress_file_range take only struct async_chunk
  btrfs: Remove fs_info from struct async_chunk
  btrfs: Rename async_cow to async_chunk
  btrfs: Preallocate chunks in cow_file_range_async
  btrfs: reserve delalloc metadata differently
  btrfs: track DIO bytes in flight
  btrfs: merge calls of btrfs_setxattr and btrfs_setxattr_trans in btrfs_set_prop
  btrfs: delete unused function btrfs_set_prop_trans
  btrfs: start transaction in xattr_handler_set_prop
  btrfs: drop local copy of inode i_mode
  btrfs: drop old_fsflags in btrfs_ioctl_setflags
  btrfs: modify local copy of btrfs_inode flags
  btrfs: drop useless inode i_flags copy and restore
  btrfs: start transaction in btrfs_ioctl_setflags()
  btrfs: export btrfs_set_prop
  btrfs: refactor btrfs_set_props to validate externally
  ...
parents 78438ce1 b1c16ac9

fs/btrfs/acl.c

+5 −1
Original line number Diff line number Diff line
@@ -93,7 +93,11 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans, 
			goto out;

	}



	if (trans)

		ret = btrfs_setxattr(trans, inode, name, value, size, 0);

	else

		ret = btrfs_setxattr_trans(inode, name, value, size, 0);



out:

	kfree(value);

fs/btrfs/backref.c

+24 −14
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, 
			count = node->ref_mod * -1;

			break;

		default:

			BUG_ON(1);

			BUG();

		}

		*total_refs += count;

		switch (node->type) {
@@ -1460,8 +1460,8 @@ int btrfs_find_all_roots(struct btrfs_trans_handle *trans, 
 * callers (such as fiemap) which want to know whether the extent is

 * shared but do not need a ref count.

 *

 * This attempts to allocate a transaction in order to account for

 * delayed refs, but continues on even when the alloc fails.

 * This attempts to attach to the running transaction in order to account for

 * delayed refs, but continues on even when no running transaction exists.

 *

 * Return: 0 if extent is not shared, 1 if it is shared, < 0 on error.

 */
@@ -1484,13 +1484,16 @@ int btrfs_check_shared(struct btrfs_root *root, u64 inum, u64 bytenr) 
	tmp = ulist_alloc(GFP_NOFS);

	roots = ulist_alloc(GFP_NOFS);

	if (!tmp || !roots) {

		ulist_free(tmp);

		ulist_free(roots);

		return -ENOMEM;

		ret = -ENOMEM;

		goto out;

	}



	trans = btrfs_join_transaction(root);

	trans = btrfs_attach_transaction(root);

	if (IS_ERR(trans)) {

		if (PTR_ERR(trans) != -ENOENT && PTR_ERR(trans) != -EROFS) {

			ret = PTR_ERR(trans);

			goto out;

		}

		trans = NULL;

		down_read(&fs_info->commit_root_sem);

	} else {
@@ -1523,6 +1526,7 @@ int btrfs_check_shared(struct btrfs_root *root, u64 inum, u64 bytenr) 
	} else {

		up_read(&fs_info->commit_root_sem);

	}

out:

	ulist_free(tmp);

	ulist_free(roots);

	return ret;
@@ -1747,7 +1751,7 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, 
		else if (flags & BTRFS_EXTENT_FLAG_DATA)

			*flags_ret = BTRFS_EXTENT_FLAG_DATA;

		else

			BUG_ON(1);

			BUG();

		return 0;

	}
@@ -1912,13 +1916,19 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info, 
			extent_item_objectid);



	if (!search_commit_root) {

		trans = btrfs_join_transaction(fs_info->extent_root);

		if (IS_ERR(trans))

		trans = btrfs_attach_transaction(fs_info->extent_root);

		if (IS_ERR(trans)) {

			if (PTR_ERR(trans) != -ENOENT &&

			    PTR_ERR(trans) != -EROFS)

				return PTR_ERR(trans);

			trans = NULL;

		}

	}



	if (trans)

		btrfs_get_tree_mod_seq(fs_info, &tree_mod_seq_elem);

	} else {

	else

		down_read(&fs_info->commit_root_sem);

	}



	ret = btrfs_find_all_leafs(trans, fs_info, extent_item_objectid,

				   tree_mod_seq_elem.seq, &refs,
@@ -1951,7 +1961,7 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info, 


	free_leaf_list(refs);

out:

	if (!search_commit_root) {

	if (trans) {

		btrfs_put_tree_mod_seq(fs_info, &tree_mod_seq_elem);

		btrfs_end_transaction(trans);

	} else {

fs/btrfs/btrfs_inode.h

+0 −8
Original line number Diff line number Diff line
@@ -147,12 +147,6 @@ struct btrfs_inode { 
	 */

	u64 last_unlink_trans;



	/*

	 * Track the transaction id of the last transaction used to create a

	 * hard link for the inode. This is used by the log tree (fsync).

	 */

	u64 last_link_trans;



	/*

	 * Number of bytes outstanding that are going to need csums.  This is

	 * used in ENOSPC accounting.
@@ -203,8 +197,6 @@ struct btrfs_inode { 
	struct inode vfs_inode;

};



extern unsigned char btrfs_filetype_table[];



static inline struct btrfs_inode *BTRFS_I(const struct inode *inode)

{

	return container_of(inode, struct btrfs_inode, vfs_inode);

fs/btrfs/compression.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static void end_compressed_bio_write(struct bio *bio) 
	cb->compressed_pages[0]->mapping = cb->inode->i_mapping;

	btrfs_writepage_endio_finish_ordered(cb->compressed_pages[0],

			cb->start, cb->start + cb->len - 1,

			bio->bi_status ? BLK_STS_OK : BLK_STS_NOTSUPP);

			bio->bi_status == BLK_STS_OK);

	cb->compressed_pages[0]->mapping = NULL;



	end_compressed_writeback(inode, cb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE