Merge "block: Move bdev_unhash_inode() after invalidate_partition()"