]> git.hungrycats.org Git - linux/commitdiff
Merge branches (11 topics incl. balance-resume) into 6.18/testing 6.18/testing
authorZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Sat, 19 Sep 2026 16:31:58 +0000 (12:31 -0400)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Sat, 19 Sep 2026 16:31:58 +0000 (12:31 -0400)
Also merges '6.18/topics/delayed-ref-fixes' (resume the delayed-ref merge walk instead of restarting it).

Also merges '6.18/topics/logical-ino' (added 2026-09-19: BTRFS_LOGICAL_INO_ARGS_COMMIT_ROOT, an opt-in commit-root walk so LOGICAL_INO callers stop pinning the tree mod log).

17 files changed:
1  2  3  4  5  6  7  8  9  10  11  12  13  14 
fs/btrfs/backref.c
fs/btrfs/block-group.c
fs/btrfs/block-group.h
fs/btrfs/btrfs_inode.h
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/file.c
fs/btrfs/fs.h
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/props.c
fs/btrfs/raid56.c
fs/btrfs/raid56.h
fs/btrfs/reflink.c
fs/btrfs/relocation.c
fs/btrfs/sysfs.c
fs/btrfs/transaction.c

Simple merge
index e9ee10bee2ece67c413696c1c3eea3d42015cff3,e9ee10bee2ece67c413696c1c3eea3d42015cff3,e9ee10bee2ece67c413696c1c3eea3d42015cff3,e9ee10bee2ece67c413696c1c3eea3d42015cff3,e9ee10bee2ece67c413696c1c3eea3d42015cff3,e9ee10bee2ece67c413696c1c3eea3d42015cff3,e9ee10bee2ece67c413696c1c3eea3d42015cff3,e9ee10bee2ece67c413696c1c3eea3d42015cff3,828969daa2675ae2acae0bba6a784302edc329dc,12ab34c571b5d639401aa8757e81ad84caabc9f8,e9ee10bee2ece67c413696c1c3eea3d42015cff3,e9ee10bee2ece67c413696c1c3eea3d42015cff3,e9ee10bee2ece67c413696c1c3eea3d42015cff3,e9ee10bee2ece67c413696c1c3eea3d42015cff3..4628f4adf76efc710fa4a83984304ae64b5aa746
                mutex_unlock(&fs_info->ro_block_group_mutex);
              
                btrfs_end_transaction(trans);
         -      if (ret)
++++++++ +++++  /*
++++++++ +++++   * The group is read-only: close and drain its open stripe runs.  An
++++++++ +++++   * allocation racing with the read-only transition either installed
++++++++ +++++   * its run before this (closed and drained here), or observes ->ro
++++++++ +++++   * under the stripe_run_lock and backs out.
++++++++ +++++   */
++++++++ +++++  if (!ret)
++++++++ +++++          btrfs_retire_block_group_stripes(cache);
++++++++++++++  else
+++++++++ ++++          btrfs_bg_unblock_nocow(cache);
                return ret;
              }
              
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/btrfs/file.c
Simple merge
diff --cc fs/btrfs/fs.h
Simple merge
Simple merge
Simple merge
Simple merge
index 4d4852f2ba7eb50dabc354f95dcf016f1cbf3784,4d4852f2ba7eb50dabc354f95dcf016f1cbf3784,4d4852f2ba7eb50dabc354f95dcf016f1cbf3784,4d4852f2ba7eb50dabc354f95dcf016f1cbf3784,4d4852f2ba7eb50dabc354f95dcf016f1cbf3784,4d4852f2ba7eb50dabc354f95dcf016f1cbf3784,4d4852f2ba7eb50dabc354f95dcf016f1cbf3784,77ffc59262e3efc5e8c356cc06bd46b3164ec248,773e5d351697a976f9adc7399b906dda31135f1a,4d4852f2ba7eb50dabc354f95dcf016f1cbf3784,4d4852f2ba7eb50dabc354f95dcf016f1cbf3784,4d4852f2ba7eb50dabc354f95dcf016f1cbf3784,4d4852f2ba7eb50dabc354f95dcf016f1cbf3784,4d4852f2ba7eb50dabc354f95dcf016f1cbf3784..a14afd64d04ec8362e519f687fe36a0f32d38dc0
@@@@@@@@@@@@@@@ -1798,6 -1798,6 -1798,6 -1798,6 -1798,6 -1798,6 -1798,6 -2053,12 -2231,7 -1798,6 -1798,6 -1798,6 -1798,6 -1798,6 +2486,12 @@@@@@@@@@@@@@@ static int verify_one_sector(struct btr
                /* No way to verify P/Q as they are not covered by data csum. */
                if (stripe_nr >= rbio->nr_data)
                        return 0;
+++++++  +++++
+++++++ ++++++  /* No csum for this sector, nothing to verify against. */
+++++++ ++++++  if (!test_bit(stripe_nr * rbio->stripe_nsectors + sector_nr,
+++++++ ++++++                rbio->csum_bitmap))
+++++++ ++++++          return 0;
+++++++ ++++++
                /*
                 * If we're rebuilding a read, we have to use pages from the
                 * bio list if possible.
index 84c4d1d29c7a88031bf38e9196d86aeb254235a3,84c4d1d29c7a88031bf38e9196d86aeb254235a3,84c4d1d29c7a88031bf38e9196d86aeb254235a3,84c4d1d29c7a88031bf38e9196d86aeb254235a3,84c4d1d29c7a88031bf38e9196d86aeb254235a3,84c4d1d29c7a88031bf38e9196d86aeb254235a3,84c4d1d29c7a88031bf38e9196d86aeb254235a3,f1384f60e44fd8daa8b294a900fa8884139297c8,9b8cc160803dba33f603e1bab969a0931c8c7cbb,84c4d1d29c7a88031bf38e9196d86aeb254235a3,84c4d1d29c7a88031bf38e9196d86aeb254235a3,84c4d1d29c7a88031bf38e9196d86aeb254235a3,84c4d1d29c7a88031bf38e9196d86aeb254235a3,84c4d1d29c7a88031bf38e9196d86aeb254235a3..18fc2109aa0c976f4557439ac2f63459ac590698
@@@@@@@@@@@@@@@ -206,5 -206,5 -206,5 -206,5 -206,5 -206,5 -206,5 -214,6 -217,7 -206,5 -206,5 -206,5 -206,5 -206,5 +225,8 @@@@@@@@@@@@@@@ void raid56_parity_cache_data_folios(st
              
              int btrfs_alloc_stripe_hash_table(struct btrfs_fs_info *info);
              void btrfs_free_stripe_hash_table(struct btrfs_fs_info *info);
+++++++ ++++++void btrfs_raid56_uncache_range(struct btrfs_fs_info *info, u64 start, u64 len);
++++++++ +++++void btrfs_flush_parked_rbios(struct btrfs_fs_info *fs_info, u64 start,
++++++++ +++++                        u64 num_bytes, bool force);
              
              #endif
Simple merge
Simple merge
Simple merge
Simple merge