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

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
...@@ -619,6 +619,7 @@ void btrfs_discard_punt_unused_bgs_list(struct btrfs_fs_info *fs_info) ...@@ -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, list_for_each_entry_safe(block_group, next, &fs_info->unused_bgs,
bg_list) { bg_list) {
list_del_init(&block_group->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); btrfs_discard_queue_work(&fs_info->discard_ctl, block_group);
} }
spin_unlock(&fs_info->unused_bgs_lock); spin_unlock(&fs_info->unused_bgs_lock);
......
...@@ -3509,6 +3509,7 @@ const struct file_operations btrfs_file_operations = { ...@@ -3509,6 +3509,7 @@ const struct file_operations btrfs_file_operations = {
.read_iter = generic_file_read_iter, .read_iter = generic_file_read_iter,
.splice_read = generic_file_splice_read, .splice_read = generic_file_splice_read,
.write_iter = btrfs_file_write_iter, .write_iter = btrfs_file_write_iter,
.splice_write = iter_file_splice_write,
.mmap = btrfs_file_mmap, .mmap = btrfs_file_mmap,
.open = btrfs_file_open, .open = btrfs_file_open,
.release = btrfs_release_file, .release = btrfs_release_file,
......
...@@ -1690,12 +1690,8 @@ static noinline int run_delalloc_nocow(struct inode *inode, ...@@ -1690,12 +1690,8 @@ static noinline int run_delalloc_nocow(struct inode *inode,
ret = fallback_to_cow(inode, locked_page, cow_start, ret = fallback_to_cow(inode, locked_page, cow_start,
found_key.offset - 1, found_key.offset - 1,
page_started, nr_written); page_started, nr_written);
if (ret) { if (ret)
if (nocow)
btrfs_dec_nocow_writers(fs_info,
disk_bytenr);
goto error; goto error;
}
cow_start = (u64)-1; cow_start = (u64)-1;
} }
...@@ -1711,9 +1707,6 @@ static noinline int run_delalloc_nocow(struct inode *inode, ...@@ -1711,9 +1707,6 @@ static noinline int run_delalloc_nocow(struct inode *inode,
ram_bytes, BTRFS_COMPRESS_NONE, ram_bytes, BTRFS_COMPRESS_NONE,
BTRFS_ORDERED_PREALLOC); BTRFS_ORDERED_PREALLOC);
if (IS_ERR(em)) { if (IS_ERR(em)) {
if (nocow)
btrfs_dec_nocow_writers(fs_info,
disk_bytenr);
ret = PTR_ERR(em); ret = PTR_ERR(em);
goto error; goto error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment