Commit 06697042 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.8-rc6-tag' of... 

Merge tag 'for-5.8-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into master

Pull btrfs fixes from David Sterba:
 "A few resouce leak fixes from recent patches, all are stable material.

  The problems have been observed during testing or have a reproducer"

* tag 'for-5.8-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: fix mount failure caused by race with umount
  btrfs: fix page leaks after failure to lock page for delalloc
  btrfs: qgroup: fix data leak caused by race between writeback and truncate
  btrfs: fix double free on ulist after backref resolution failure
parents 6a343656 48cfa61b

fs/btrfs/backref.c

+1 −0
Original line number Diff line number Diff line
@@ -1461,6 +1461,7 @@ static int btrfs_find_all_roots_safe(struct btrfs_trans_handle *trans, 
		if (ret < 0 && ret != -ENOENT) {

			ulist_free(tmp);

			ulist_free(*roots);

			*roots = NULL;

			return ret;

		}

		node = ulist_next(tmp, &uiter);

fs/btrfs/extent_io.c

+2 −1
Original line number Diff line number Diff line
@@ -1999,6 +1999,7 @@ static int __process_pages_contig(struct address_space *mapping, 
				if (!PageDirty(pages[i]) ||

				    pages[i]->mapping != mapping) {

					unlock_page(pages[i]);

					for (; i < ret; i++)

						put_page(pages[i]);

					err = -EAGAIN;

					goto out;

fs/btrfs/inode.c

+10 −13
Original line number Diff line number Diff line
@@ -8123,19 +8123,16 @@ again: 
	/*

	 * Qgroup reserved space handler

	 * Page here will be either

	 * 1) Already written to disk

	 *    In this case, its reserved space is released from data rsv map

	 *    and will be freed by delayed_ref handler finally.

	 *    So even we call qgroup_free_data(), it won't decrease reserved

	 *    space.

	 * 2) Not written to disk

	 *    This means the reserved space should be freed here. However,

	 *    if a truncate invalidates the page (by clearing PageDirty)

	 *    and the page is accounted for while allocating extent

	 *    in btrfs_check_data_free_space() we let delayed_ref to

	 *    free the entire extent.

	 */

	if (PageDirty(page))

	 * 1) Already written to disk or ordered extent already submitted

	 *    Then its QGROUP_RESERVED bit in io_tree is already cleaned.

	 *    Qgroup will be handled by its qgroup_record then.

	 *    btrfs_qgroup_free_data() call will do nothing here.

	 *

	 * 2) Not written to disk yet

	 *    Then btrfs_qgroup_free_data() call will clear the QGROUP_RESERVED

	 *    bit of its io_tree, and free the qgroup reserved data space.

	 *    Since the IO will never happen for this page.

	 */

	btrfs_qgroup_free_data(inode, NULL, page_start, PAGE_SIZE);

	if (!inode_evicting) {

		clear_extent_bit(tree, page_start, page_end, EXTENT_LOCKED |

fs/btrfs/volumes.c

+8 −0
Original line number Diff line number Diff line
@@ -7051,6 +7051,14 @@ int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info) 
	mutex_lock(&uuid_mutex);

	mutex_lock(&fs_info->chunk_mutex);



	/*

	 * It is possible for mount and umount to race in such a way that

	 * we execute this code path, but open_fs_devices failed to clear

	 * total_rw_bytes. We certainly want it cleared before reading the

	 * device items, so clear it here.

	 */

	fs_info->fs_devices->total_rw_bytes = 0;



	/*

	 * Read all device items, and then all the chunk items. All

	 * device items are found before any chunk item (their object id

CRA Git | Maintained and supported by SUSTech CRA and CCSE