tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'for-5.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

Pull btrfs fixes from David Sterba:
"Two fixes.

The first is a regression: when dropping some incompat bits the
conditions were reversed. The other is a fix for rename whiteout
potentially leaving stack memory linked to a list"

* tag 'for-5.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: fix removal of raid[56|1c34} incompat flags after removing block group
btrfs: fix log context list corruption after rename whiteout error

Linus Torvalds 67d584e3 b3c03db6

options
unified split
Changed files
+6 -2
fs
btrfs
block-group.c
inode.c
+2 -2
fs/btrfs/block-group.c
··· 856 856 found_raid1c34 = true; 857 857 up_read(&sinfo->groups_sem); 858 858 } 859 - if (found_raid56) 859 + if (!found_raid56) 860 860 btrfs_clear_fs_incompat(fs_info, RAID56); 861 - if (found_raid1c34) 861 + if (!found_raid1c34) 862 862 btrfs_clear_fs_incompat(fs_info, RAID1C34); 863 863 } 864 864 }
+4
fs/btrfs/inode.c
··· 9496 9496 ret = btrfs_sync_log(trans, BTRFS_I(old_inode)->root, &ctx); 9497 9497 if (ret) 9498 9498 commit_transaction = true; 9499 + } else if (sync_log) { 9500 + mutex_lock(&root->log_mutex); 9501 + list_del(&ctx.list); 9502 + mutex_unlock(&root->log_mutex); 9499 9503 } 9500 9504 if (commit_transaction) { 9501 9505 ret = btrfs_commit_transaction(trans);