From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Jun 2023 18:41:38 +0000 (-0700)
Subject: Merge tag 'for-6.5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
X-Git-Tag: v6.6.17~4629
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc423f6337d0a5ff1906f3b3d465d28c0d1705f6;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'for-6.5-tag' of git://git./linux/kernel/git/kdave/linux

Pull btrfs updates from David Sterba:
 "Mainly core changes, refactoring and optimizations.

  Performance is improved in some areas, overall there may be a
  cumulative improvement due to refactoring that removed lookups in the
  IO path or simplified IO submission tracking.

  Core:

   - submit IO synchronously for fast checksums (crc32c and xxhash),
     remove high priority worker kthread

   - read extent buffer in one go, simplify IO tracking, bio submission
     and locking

   - remove additional tracking of redirtied extent buffers, originally
     added for zoned mode but actually not needed

   - track ordered extent pointer in bio to avoid rbtree lookups during
     IO

   - scrub, use recovered data stripes as cache to avoid unnecessary
     read

   - in zoned mode, optimize logical to physical mappings of extents

   - remove PageError handling, not set by VFS nor writeback

   - cleanups, refactoring, better structure packing

   - lots of error handling improvements

   - more assertions, lockdep annotations

   - print assertion failure with the exact line where it happens

   - tracepoint updates

   - more debugging prints

  Performance:

   - speedup in fsync(), better tracking of inode logged status can
     avoid transaction commit

   - IO path structures track logical offsets in data structures and
     does not need to look it up

  User visible changes:

   - don't commit transaction for every created subvolume, this can
     reduce time when many subvolumes are created in a batch

   - print affected files when relocation fails

   - trigger orphan file cleanup during START_SYNC ioctl

  Notable fixes:

   - fix crash when disabling quota and relocation

   - fix crashes when removing roots from drity list

   - fix transacion abort during relocation when converting from newer
     profiles not covered by fallback

   - in zoned mode, stop reclaiming block groups if filesystem becomes
     read-only

   - fix rare race condition in tree mod log rewind that can miss some
     btree node slots

   - with enabled fsverity, drop up-to-date page bit in case the
     verification fails"

* tag 'for-6.5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (194 commits)
  btrfs: fix race between quota disable and relocation
  btrfs: add comment to struct btrfs_fs_info::dirty_cowonly_roots
  btrfs: fix race when deleting free space root from the dirty cow roots list
  btrfs: fix race when deleting quota root from the dirty cow roots list
  btrfs: tracepoints: also show actual number of the outstanding extents
  btrfs: update i_version in update_dev_time
  btrfs: make btrfs_compressed_bioset static
  btrfs: add handling for RAID1C23/DUP to btrfs_reduce_alloc_profile
  btrfs: scrub: remove btrfs_fs_info::scrub_wr_completion_workers
  btrfs: scrub: remove scrub_ctx::csum_list member
  btrfs: do not BUG_ON after failure to migrate space during truncation
  btrfs: do not BUG_ON on failure to get dir index for new snapshot
  btrfs: send: do not BUG_ON() on unexpected symlink data extent
  btrfs: do not BUG_ON() when dropping inode items from log root
  btrfs: replace BUG_ON() at split_item() with proper error handling
  btrfs: do not BUG_ON() on tree mod log failures at btrfs_del_ptr()
  btrfs: do not BUG_ON() on tree mod log failures at insert_ptr()
  btrfs: do not BUG_ON() on tree mod log failure at insert_new_root()
  btrfs: do not BUG_ON() on tree mod log failures at push_nodes_for_insert()
  btrfs: abort transaction at update_ref_for_cow() when ref count is zero
  ...
---

cc423f6337d0a5ff1906f3b3d465d28c0d1705f6
diff --cc fs/btrfs/volumes.c
index 72a838c,b8540af..4193ace
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@@ -6223,14 -6224,14 +6226,14 @@@ static void set_io_stripe(struct btrfs_
  {
  	dst->dev = map->stripes[stripe_index].dev;
  	dst->physical = map->stripes[stripe_index].physical +
 -			stripe_offset + (stripe_nr << BTRFS_STRIPE_LEN_SHIFT);
 +			stripe_offset + btrfs_stripe_nr_to_offset(stripe_nr);
  }
  
- int __btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
- 		      u64 logical, u64 *length,
- 		      struct btrfs_io_context **bioc_ret,
- 		      struct btrfs_io_stripe *smap, int *mirror_num_ret,
- 		      int need_raid_map)
+ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
+ 		    u64 logical, u64 *length,
+ 		    struct btrfs_io_context **bioc_ret,
+ 		    struct btrfs_io_stripe *smap, int *mirror_num_ret,
+ 		    int need_raid_map)
  {
  	struct extent_map *em;
  	struct map_lookup *map;