quoted

Mina, does this patch depend on changes to restore_reserve_on_error()?

Yes, this patch (and only this patch) depends on your changes for
complete and correct functionality. I'm not sure what's the impact

...of missing your changes aside from the underflow. The userfaultfd
tests still pass.