Commit 72c34e8d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs fixes from David Sterba:
 "Two refcounting fixes and one prepartory patch for upcoming splice
  cleanup:

   - fix double put of block group with nodatacow

   - fix missing block group put when remounting with discard=async

   - explicitly set splice callback (no functional change), to ease
     integrating splice cleanup patches"

* tag 'for-5.8-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: wire up iter_file_splice_write
  btrfs: fix double put of block group with nocow
  btrfs: discard: add missing put when grabbing block group from unused list
parents 9901a6bd d7776591

fs/btrfs/discard.c

+1 −0
Original line number Diff line number Diff line
@@ -619,6 +619,7 @@ void btrfs_discard_punt_unused_bgs_list(struct btrfs_fs_info *fs_info) 
	list_for_each_entry_safe(block_group, next, &fs_info->unused_bgs,

				 bg_list) {

		list_del_init(&block_group->bg_list);

		btrfs_put_block_group(block_group);

		btrfs_discard_queue_work(&fs_info->discard_ctl, block_group);

	}

	spin_unlock(&fs_info->unused_bgs_lock);

fs/btrfs/file.c

+1 −0
Original line number Diff line number Diff line
@@ -3509,6 +3509,7 @@ const struct file_operations btrfs_file_operations = { 
	.read_iter      = generic_file_read_iter,

	.splice_read	= generic_file_splice_read,

	.write_iter	= btrfs_file_write_iter,

	.splice_write	= iter_file_splice_write,

	.mmap		= btrfs_file_mmap,

	.open		= btrfs_file_open,

	.release	= btrfs_release_file,

fs/btrfs/inode.c

+1 −8
Original line number Diff line number Diff line
@@ -1690,12 +1690,8 @@ out_check: 
			ret = fallback_to_cow(inode, locked_page, cow_start,

					      found_key.offset - 1,

					      page_started, nr_written);

			if (ret) {

				if (nocow)

					btrfs_dec_nocow_writers(fs_info,

								disk_bytenr);

			if (ret)

				goto error;

			}

			cow_start = (u64)-1;

		}
@@ -1711,9 +1707,6 @@ out_check: 
					  ram_bytes, BTRFS_COMPRESS_NONE,

					  BTRFS_ORDERED_PREALLOC);

			if (IS_ERR(em)) {

				if (nocow)

					btrfs_dec_nocow_writers(fs_info,

								disk_bytenr);

				ret = PTR_ERR(em);

				goto error;

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE