]> git.hungrycats.org Git - linux/commitdiff
Merge branches (11 topics incl. balance-resume) into misc-next/testing misc-next/testing
authorZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Fri, 18 Sep 2026 21:36:32 +0000 (17:36 -0400)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Fri, 18 Sep 2026 21:36:32 +0000 (17:36 -0400)
15 files changed:
1  2  3  4  5  6  7  8  9  10  11  12 
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/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

index e6080cb47c895c45dc4a300a9dc19cb80d34c2e2,e6080cb47c895c45dc4a300a9dc19cb80d34c2e2,e6080cb47c895c45dc4a300a9dc19cb80d34c2e2,e6080cb47c895c45dc4a300a9dc19cb80d34c2e2,e6080cb47c895c45dc4a300a9dc19cb80d34c2e2,e6080cb47c895c45dc4a300a9dc19cb80d34c2e2,ed9c15d8ac6a2bf69d4d9fb820aa0cc65a50b365,e6080cb47c895c45dc4a300a9dc19cb80d34c2e2,e6080cb47c895c45dc4a300a9dc19cb80d34c2e2,e6080cb47c895c45dc4a300a9dc19cb80d34c2e2,e6080cb47c895c45dc4a300a9dc19cb80d34c2e2,5b0e0737f93e2849f6e3cb83b0dd28ee463d2881..44e130325f5eddaa780284d21ea91f3b203c38fd
                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
index 8ec24dbb180f9266b04625c9f11dd9b649d7a3f4,8ec24dbb180f9266b04625c9f11dd9b649d7a3f4,8ec24dbb180f9266b04625c9f11dd9b649d7a3f4,8ec24dbb180f9266b04625c9f11dd9b649d7a3f4,8ec24dbb180f9266b04625c9f11dd9b649d7a3f4,8ec24dbb180f9266b04625c9f11dd9b649d7a3f4,8ec24dbb180f9266b04625c9f11dd9b649d7a3f4,8ec24dbb180f9266b04625c9f11dd9b649d7a3f4,8ec24dbb180f9266b04625c9f11dd9b649d7a3f4,b3afc1883a5a609ff7c837fc007376dcb538315b,8ec24dbb180f9266b04625c9f11dd9b649d7a3f4,80d307202e574d04bbf458f465a7ffef5b004fc5..297bc18b981ffef033102379711def8d57241034
@@@@@@@@@@@@@ -1898,6 -1898,6 -1898,6 -1898,6 -1898,6 -1898,6 -1898,6 -1898,6 -1898,6 -2156,12 -1898,6 -2330,7 +2588,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 8542648199f1a485371e3622c74aff028293b0a0,8542648199f1a485371e3622c74aff028293b0a0,8542648199f1a485371e3622c74aff028293b0a0,8542648199f1a485371e3622c74aff028293b0a0,8542648199f1a485371e3622c74aff028293b0a0,8542648199f1a485371e3622c74aff028293b0a0,8542648199f1a485371e3622c74aff028293b0a0,8542648199f1a485371e3622c74aff028293b0a0,8542648199f1a485371e3622c74aff028293b0a0,c7c4b0db61f4c7ede79107d68d7dbd206552cc33,8542648199f1a485371e3622c74aff028293b0a0,ca15c45f8f4beb39fe41f5f8cd92adb4502709fd..cff1a200f3bcf97331637d2e66d9140fbfed9891
@@@@@@@@@@@@@ -287,5 -287,5 -287,5 -287,5 -287,5 -287,5 -287,5 -287,5 -287,5 -295,6 -287,5 -298,7 +306,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