Not a fan of the new bit, but I see no good way around it. Reviewed-by: Christoph Hellwig <hch@xxxxxx>