Merge an upstream commit to correct a missing rename in generic code Signed-off-by: Felix Fietkau <nbd@nbd.name>