[PATCH] Centralise definitions of sector_t and blkcnt_t