Commit 54955e3b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs fixes from David Sterba:

 - fixes of error handling cleanup of metadata accounting with qgroups
   enabled

 - fix swapped values for qgroup tracepoints

 - fix race when handling full sync flag

 - don't start unused worker thread, functionality removed already

* tag 'for-5.4-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  Btrfs: check for the full sync flag while holding the inode lock during fsync
  Btrfs: fix qgroup double free after failure to reserve metadata for delalloc
  btrfs: tracepoints: Fix bad entry members of qgroup events
  btrfs: tracepoints: Fix wrong parameter order for qgroup events
  btrfs: qgroup: Always free PREALLOC META reserve in btrfs_delalloc_release_extents()
  btrfs: don't needlessly create extent-refs kernel thread
  btrfs: block-group: Fix a memory leak due to missing btrfs_put_block_group()
  Btrfs: add missing extents release on file extent cluster relocation error
parents 3b7c59a1 ba0b084a

fs/btrfs/block-group.c

+1 −0
Original line number Diff line number Diff line
@@ -1761,6 +1761,7 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info) 
			btrfs_err(info,

"bg %llu is a mixed block group but filesystem hasn't enabled mixed block groups",

				  cache->key.objectid);

			btrfs_put_block_group(cache);

			ret = -EINVAL;

			goto error;

		}

fs/btrfs/ctree.h

+1 −4
Original line number Diff line number Diff line
@@ -734,8 +734,6 @@ struct btrfs_fs_info { 
	struct btrfs_workqueue *fixup_workers;

	struct btrfs_workqueue *delayed_workers;



	/* the extent workers do delayed refs on the extent allocation tree */

	struct btrfs_workqueue *extent_workers;

	struct task_struct *transaction_kthread;

	struct task_struct *cleaner_kthread;

	u32 thread_pool_size;
@@ -2489,8 +2487,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root, 
				     int nitems, bool use_global_rsv);

void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info,

				      struct btrfs_block_rsv *rsv);

void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes,

				    bool qgroup_free);

void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes);



int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes);

u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo);

fs/btrfs/delalloc-space.c

+2 −5
Original line number Diff line number Diff line
@@ -381,7 +381,6 @@ int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes) 
out_qgroup:

	btrfs_qgroup_free_meta_prealloc(root, qgroup_reserve);

out_fail:

	btrfs_inode_rsv_release(inode, true);

	if (delalloc_lock)

		mutex_unlock(&inode->delalloc_mutex);

	return ret;
@@ -418,7 +417,6 @@ void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes, 
 * btrfs_delalloc_release_extents - release our outstanding_extents

 * @inode: the inode to balance the reservation for.

 * @num_bytes: the number of bytes we originally reserved with

 * @qgroup_free: do we need to free qgroup meta reservation or convert them.

 *

 * When we reserve space we increase outstanding_extents for the extents we may

 * add.  Once we've set the range as delalloc or created our ordered extents we
@@ -426,8 +424,7 @@ void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes, 
 * temporarily tracked outstanding_extents.  This _must_ be used in conjunction

 * with btrfs_delalloc_reserve_metadata.

 */

void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes,

				    bool qgroup_free)

void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes)

{

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	unsigned num_extents;
@@ -441,7 +438,7 @@ void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes, 
	if (btrfs_is_testing(fs_info))

		return;



	btrfs_inode_rsv_release(inode, qgroup_free);

	btrfs_inode_rsv_release(inode, true);

}



/**

fs/btrfs/disk-io.c

+0 −6
Original line number Diff line number Diff line
@@ -2008,7 +2008,6 @@ static void btrfs_stop_all_workers(struct btrfs_fs_info *fs_info) 
	btrfs_destroy_workqueue(fs_info->readahead_workers);

	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
@@ -2214,10 +2213,6 @@ static int btrfs_init_workqueues(struct btrfs_fs_info *fs_info, 
				      max_active, 2);

	fs_info->qgroup_rescan_workers =

		btrfs_alloc_workqueue(fs_info, "qgroup-rescan", flags, 1, 0);

	fs_info->extent_workers =

		btrfs_alloc_workqueue(fs_info, "extent-refs", flags,

				      min_t(u64, fs_devices->num_devices,

					    max_active), 8);



	if (!(fs_info->workers && fs_info->delalloc_workers &&

	      fs_info->submit_workers && fs_info->flush_workers &&
@@ -2228,7 +2223,6 @@ static int btrfs_init_workqueues(struct btrfs_fs_info *fs_info, 
	      fs_info->endio_freespace_worker && fs_info->rmw_workers &&

	      fs_info->caching_workers && fs_info->readahead_workers &&

	      fs_info->fixup_workers && fs_info->delayed_workers &&

	      fs_info->extent_workers &&

	      fs_info->qgroup_rescan_workers)) {

		return -ENOMEM;

	}

fs/btrfs/file.c

+20 −23
Original line number Diff line number Diff line
@@ -1692,7 +1692,7 @@ again: 
				    force_page_uptodate);

		if (ret) {

			btrfs_delalloc_release_extents(BTRFS_I(inode),

						       reserve_bytes, true);

						       reserve_bytes);

			break;

		}
@@ -1704,7 +1704,7 @@ again: 
			if (extents_locked == -EAGAIN)

				goto again;

			btrfs_delalloc_release_extents(BTRFS_I(inode),

						       reserve_bytes, true);

						       reserve_bytes);

			ret = extents_locked;

			break;

		}
@@ -1772,8 +1772,7 @@ again: 
		else

			free_extent_state(cached_state);



		btrfs_delalloc_release_extents(BTRFS_I(inode), reserve_bytes,

					       true);

		btrfs_delalloc_release_extents(BTRFS_I(inode), reserve_bytes);

		if (ret) {

			btrfs_drop_pages(pages, num_pages);

			break;
@@ -2068,25 +2067,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 
	struct btrfs_trans_handle *trans;

	struct btrfs_log_ctx ctx;

	int ret = 0, err;

	u64 len;



	/*

	 * If the inode needs a full sync, make sure we use a full range to

	 * avoid log tree corruption, due to hole detection racing with ordered

	 * extent completion for adjacent ranges, and assertion failures during

	 * hole detection.

	 */

	if (test_bit(BTRFS_INODE_NEEDS_FULL_SYNC,

		     &BTRFS_I(inode)->runtime_flags)) {

		start = 0;

		end = LLONG_MAX;

	}



	/*

	 * The range length can be represented by u64, we have to do the typecasts

	 * to avoid signed overflow if it's [0, LLONG_MAX] eg. from fsync()

	 */

	len = (u64)end - (u64)start + 1;

	trace_btrfs_sync_file(file, datasync);



	btrfs_init_log_ctx(&ctx, inode);
@@ -2112,6 +2093,19 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 


	atomic_inc(&root->log_batch);



	/*

	 * If the inode needs a full sync, make sure we use a full range to

	 * avoid log tree corruption, due to hole detection racing with ordered

	 * extent completion for adjacent ranges, and assertion failures during

	 * hole detection. Do this while holding the inode lock, to avoid races

	 * with other tasks.

	 */

	if (test_bit(BTRFS_INODE_NEEDS_FULL_SYNC,

		     &BTRFS_I(inode)->runtime_flags)) {

		start = 0;

		end = LLONG_MAX;

	}



	/*

	 * Before we acquired the inode's lock, someone may have dirtied more

	 * pages in the target range. We need to make sure that writeback for
@@ -2139,8 +2133,11 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 
	/*

	 * We have to do this here to avoid the priority inversion of waiting on

	 * IO of a lower priority task while holding a transaction open.

	 *

	 * Also, the range length can be represented by u64, we have to do the

	 * typecasts to avoid signed overflow if it's [0, LLONG_MAX].

	 */

	ret = btrfs_wait_ordered_range(inode, start, len);

	ret = btrfs_wait_ordered_range(inode, start, (u64)end - (u64)start + 1);

	if (ret) {

		up_write(&BTRFS_I(inode)->dio_sem);

		inode_unlock(inode);

CRA Git | Maintained and supported by SUSTech CRA and CCSE