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

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

Pull btrfs fixes from David Sterba:
 "More regression fixes and stabilization.

  Regressions:

   - zoned mode
      - count zone sizes in wider int types
      - fix space accounting for read-only block groups

   - subpage: fix page tail zeroing

  Fixes:

   - fix spurious warning when remounting with free space tree

   - fix warning when creating a directory with smack enabled

   - ioctl checks for qgroup inheritance when creating a snapshot

   - qgroup
      - fix missing unlock on error path in zero range
      - fix amount of released reservation on error
      - fix flushing from unsafe context with open transaction,
        potentially deadlocking

   - minor build warning fixes"

* tag 'for-5.12-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: zoned: do not account freed region of read-only block group as zone_unusable
  btrfs: zoned: use sector_t for zone sectors
  btrfs: subpage: fix the false data csum mismatch error
  btrfs: fix warning when creating a directory with smack enabled
  btrfs: don't flush from btrfs_delayed_inode_reserve_metadata
  btrfs: export and rename qgroup_reserve_meta
  btrfs: free correct amount of space in btrfs_delayed_inode_reserve_metadata
  btrfs: fix spurious free_space_tree remount warning
  btrfs: validate qgroup inherit for SNAP_CREATE_V2 ioctl
  btrfs: unlock extents in btrfs_zero_range in case of quota reservation errors
  btrfs: ref-verify: use 'inline void' keyword ordering
parents 6bf331d5 badae9c8

fs/btrfs/delayed-inode.c

+3 −2
Original line number Diff line number Diff line
@@ -627,7 +627,8 @@ static int btrfs_delayed_inode_reserve_metadata( 
	 */

	if (!src_rsv || (!trans->bytes_reserved &&

			 src_rsv->type != BTRFS_BLOCK_RSV_DELALLOC)) {

		ret = btrfs_qgroup_reserve_meta_prealloc(root, num_bytes, true);

		ret = btrfs_qgroup_reserve_meta(root, num_bytes,

					  BTRFS_QGROUP_RSV_META_PREALLOC, true);

		if (ret < 0)

			return ret;

		ret = btrfs_block_rsv_add(root, dst_rsv, num_bytes,
@@ -649,7 +650,7 @@ static int btrfs_delayed_inode_reserve_metadata( 
						      btrfs_ino(inode),

						      num_bytes, 1);

		} else {

			btrfs_qgroup_free_meta_prealloc(root, fs_info->nodesize);

			btrfs_qgroup_free_meta_prealloc(root, num_bytes);

		}

		return ret;

	}

fs/btrfs/extent_io.c

+16 −5
Original line number Diff line number Diff line
@@ -3008,12 +3008,23 @@ static void end_bio_extent_readpage(struct bio *bio) 
		if (likely(uptodate)) {

			loff_t i_size = i_size_read(inode);

			pgoff_t end_index = i_size >> PAGE_SHIFT;

			unsigned off;



			/* Zero out the end if this page straddles i_size */

			off = offset_in_page(i_size);

			if (page->index == end_index && off)

				zero_user_segment(page, off, PAGE_SIZE);

			/*

			 * Zero out the remaining part if this range straddles

			 * i_size.

			 *

			 * Here we should only zero the range inside the bvec,

			 * not touch anything else.

			 *

			 * NOTE: i_size is exclusive while end is inclusive.

			 */

			if (page->index == end_index && i_size <= end) {

				u32 zero_start = max(offset_in_page(i_size),

						     offset_in_page(end));



				zero_user_segment(page, zero_start,

						  offset_in_page(end) + 1);

			}

		}

		ASSERT(bio_offset + len > bio_offset);

		bio_offset += len;

fs/btrfs/file.c

+4 −1
Original line number Diff line number Diff line
@@ -3260,8 +3260,11 @@ static int btrfs_zero_range(struct inode *inode, 
			goto out;

		ret = btrfs_qgroup_reserve_data(BTRFS_I(inode), &data_reserved,

						alloc_start, bytes_to_reserve);

		if (ret)

		if (ret) {

			unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart,

					     lockend, &cached_state);

			goto out;

		}

		ret = btrfs_prealloc_file_range(inode, mode, alloc_start,

						alloc_end - alloc_start,

						i_blocksize(inode),

fs/btrfs/free-space-cache.c

+6 −1
Original line number Diff line number Diff line
@@ -2555,6 +2555,11 @@ static int __btrfs_add_free_space_zoned(struct btrfs_block_group *block_group, 
	to_unusable = size - to_free;



	ctl->free_space += to_free;

	/*

	 * If the block group is read-only, we should account freed space into

	 * bytes_readonly.

	 */

	if (!block_group->ro)

		block_group->zone_unusable += to_unusable;

	spin_unlock(&ctl->tree_lock);

	if (!used) {

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -6083,7 +6083,7 @@ static int btrfs_dirty_inode(struct inode *inode) 
		return PTR_ERR(trans);



	ret = btrfs_update_inode(trans, root, BTRFS_I(inode));

	if (ret && ret == -ENOSPC) {

	if (ret && (ret == -ENOSPC || ret == -EDQUOT)) {

		/* whoops, lets try again with the full transaction */

		btrfs_end_transaction(trans);

		trans = btrfs_start_transaction(root, 1);