[PATCH 0/2] Optimize initialization of storage files