I'm not sure why you opted to change the name of this variable here, but
the patch is testing successfully: no observed r2t errors since apply
this, so I think we're good to go for that regression.
I've dropped the variable rename and applied the patch to nvme-5.15,
thanks.