Commit 6cc9306b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs fixes from David Sterba:
 "We have a few regressions and one fix for stable:

   - revert fsync optimization

   - fix lost i_size update

   - fix a space accounting leak

   - build fix, add back definition of a deprecated ioctl flag

   - fix search condition for old roots in relocation"

* tag 'for-5.7-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: re-instantiate the removed BTRFS_SUBVOL_CREATE_ASYNC definition
  btrfs: fix reclaim counter leak of space_info objects
  btrfs: make full fsyncs always operate on the entire file again
  btrfs: fix lost i_size update after cloning inline extent
  btrfs: check commit root generation in should_ignore_root
parents f4cd6668 34c51814

fs/btrfs/block-group.c

+1 −0
Original line number Diff line number Diff line
@@ -3370,6 +3370,7 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info) 
			    space_info->bytes_reserved > 0 ||

			    space_info->bytes_may_use > 0))

			btrfs_dump_space_info(info, space_info, 0, 0);

		WARN_ON(space_info->reclaim_size > 0);

		list_del(&space_info->list);

		btrfs_sysfs_remove_space_info(space_info);

	}

fs/btrfs/file.c

+15 −0
Original line number Diff line number Diff line
@@ -2097,6 +2097,21 @@ 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 races between logging and

	 * completion of ordered extents for adjancent ranges - both races

	 * could lead to file extent items in the log with overlapping ranges.

	 * 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

fs/btrfs/reflink.c

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ copy_inline_extent: 
			    size);

	inode_add_bytes(dst, datal);

	set_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &BTRFS_I(dst)->runtime_flags);

	ret = btrfs_inode_set_file_extent_range(BTRFS_I(dst), 0, aligned_end);

out:

	if (!ret && !trans) {

		/*

fs/btrfs/relocation.c

+2 −2
Original line number Diff line number Diff line
@@ -611,8 +611,8 @@ static int should_ignore_root(struct btrfs_root *root) 
	if (!reloc_root)

		return 0;



	if (btrfs_root_last_snapshot(&reloc_root->root_item) ==

	    root->fs_info->running_transaction->transid - 1)

	if (btrfs_header_generation(reloc_root->commit_root) ==

	    root->fs_info->running_transaction->transid)

		return 0;

	/*

	 * if there is reloc tree and it was created in previous

fs/btrfs/space-info.c

+14 −6
Original line number Diff line number Diff line
@@ -361,6 +361,16 @@ int btrfs_can_overcommit(struct btrfs_fs_info *fs_info, 
	return 0;

}



static void remove_ticket(struct btrfs_space_info *space_info,

			  struct reserve_ticket *ticket)

{

	if (!list_empty(&ticket->list)) {

		list_del_init(&ticket->list);

		ASSERT(space_info->reclaim_size >= ticket->bytes);

		space_info->reclaim_size -= ticket->bytes;

	}

}



/*

 * This is for space we already have accounted in space_info->bytes_may_use, so

 * basically when we're returning space from block_rsv's.
@@ -388,9 +398,7 @@ again: 
			btrfs_space_info_update_bytes_may_use(fs_info,

							      space_info,

							      ticket->bytes);

			list_del_init(&ticket->list);

			ASSERT(space_info->reclaim_size >= ticket->bytes);

			space_info->reclaim_size -= ticket->bytes;

			remove_ticket(space_info, ticket);

			ticket->bytes = 0;

			space_info->tickets_id++;

			wake_up(&ticket->wait);
@@ -899,7 +907,7 @@ static bool maybe_fail_all_tickets(struct btrfs_fs_info *fs_info, 
			btrfs_info(fs_info, "failing ticket with %llu bytes",

				   ticket->bytes);



		list_del_init(&ticket->list);

		remove_ticket(space_info, ticket);

		ticket->error = -ENOSPC;

		wake_up(&ticket->wait);
@@ -1063,7 +1071,7 @@ static void wait_reserve_ticket(struct btrfs_fs_info *fs_info, 
			 * despite getting an error, resulting in a space leak

			 * (bytes_may_use counter of our space_info).

			 */

			list_del_init(&ticket->list);

			remove_ticket(space_info, ticket);

			ticket->error = -EINTR;

			break;

		}
@@ -1121,7 +1129,7 @@ static int handle_reserve_ticket(struct btrfs_fs_info *fs_info, 
		 * either the async reclaim job deletes the ticket from the list

		 * or we delete it ourselves at wait_reserve_ticket().

		 */

		list_del_init(&ticket->list);

		remove_ticket(space_info, ticket);

		if (!ret)

			ret = -ENOSPC;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE