Merge "block: Fix bdi assignment to bdev inode when racing with disk delete"