On 12/16/20 2:13 PM, Linus Torvalds wrote: > On Mon, Dec 14, 2020 at 7:30 AM Jens Axboe <axboe@xxxxxxxxx> wrote: >> >> Note that this throws a merge conflict in drivers/md/raid10.c, again due >> to the late md discard revert for 5.10. Resolution is straight forward, >> __make_request() just needs to use the non-HEAD part of the resolution: >> >> r10_bio->read_slot = -1; >> memset(r10_bio->devs, 0, sizeof(r10_bio->devs[0]) * conf->geo.raid_disks); > > What? > > No, that can't be right. That undoes part of the revert. > > The proper resolution looks to be > > + r10_bio->read_slot = -1; > - memset(r10_bio->devs, 0, sizeof(r10_bio->devs[0]) * > conf->geo.raid_disks); > + memset(r10_bio->devs, 0, sizeof(r10_bio->devs[0]) * conf->copies); > > as far as I can tell. > > Am I missing something? No you are right, looking at the current tree! -- Jens Axboe
