Merge tag 'for-6.10-rc4-tag' of git://git.kernel.org/pub/scm/linux/ke…

…rnel/git/kdave/linux

Pull btrfs fixes from David Sterba:

 - fix potential infinite loop when doing block grou reclaim

 - fix crash on emulated zoned device and NOCOW files

* tag 'for-6.10-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: zoned: allocate dummy checksums for zoned NODATASUM writes
  btrfs: retry block group reclaim without infinite loop

fs/btrfs/bio.c

@@ -741,7 +741,9 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
  ret = btrfs_bio_csum(bbio);
  if (ret)
  goto fail_put_bio;
- } else if (use_append) {
+ } else if (use_append ||
+ (btrfs_is_zoned(fs_info) && inode &&
+ inode->flags & BTRFS_INODE_NODATASUM)) {
  ret = btrfs_alloc_dummy_sum(bbio);
  if (ret)
  goto fail_put_bio;

fs/btrfs/block-group.c

@@ -1785,6 +1785,7 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)
  container_of(work, struct btrfs_fs_info, reclaim_bgs_work);
  struct btrfs_block_group *bg;
  struct btrfs_space_info *space_info;
+ LIST_HEAD(retry_list);
 
  if (!test_bit(BTRFS_FS_OPEN, &fs_info->flags))
  return;
@@ -1921,8 +1922,11 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)
  }
 
 next:
- if (ret)
- btrfs_mark_bg_to_reclaim(bg);
+ if (ret) {
+ /* Refcount held by the reclaim_bgs list after splice. */
+ btrfs_get_block_group(bg);
+ list_add_tail(&bg->bg_list, &retry_list);
+ }
  btrfs_put_block_group(bg);
 
  mutex_unlock(&fs_info->reclaim_bgs_lock);
@@ -1942,6 +1946,9 @@ void btrfs_reclaim_bgs_work(struct work_struct *work)
  spin_unlock(&fs_info->unused_bgs_lock);
  mutex_unlock(&fs_info->reclaim_bgs_lock);
 end:
+ spin_lock(&fs_info->unused_bgs_lock);
+ list_splice_tail(&retry_list, &fs_info->reclaim_bgs);
+ spin_unlock(&fs_info->unused_bgs_lock);
  btrfs_exclop_finish(fs_info);
  sb_end_write(fs_info->sb);
 }