btrfs: drop 2 patches, rename others