Re: [PATCH v2] disk: Use a helper function to reduce duplication