Reduces number of return paths to two.  This is a preparation for
quota support.

Submitted by Christoph Hellwig