In a storage system that implements RAID (D+P) protection groups a drive subset initially has (D+P) drives plus a spare drive with (D+P) splits. Spare splits are distributed with drive index and split index adjacency such that no single drive or split index contains multiple spare splits. When the drive subset is incremented by one drive a group of selected splits are relocated to the new drive based on drive index and split index adjacency such that no single drive or split index contains multiple members of a new protection group. If one of the drives is failing or fails, then an adjusted spare split index value is calculated for each protection group member on that drive so that the protection group members are rebuilt or relocated without placing more than one member of any protection group on a single drive. Adjusted spare split index values may be calculated in steps using the data split indices in ascending order and the largest drive indices in descending order.