[PATCH] invalidate: remove_mapping() fix