[BTRFS] Applied upstream pull-requests before they are merged