On 7/3/22 5:49 PM, Song Liu wrote: > > >> On Jul 3, 2022, at 9:19 AM, Jens Axboe <axboe@xxxxxxxxx> wrote: >> >> On 7/3/22 10:02 AM, Jens Axboe wrote: >>> On 7/3/22 9:13 AM, Song Liu wrote: >>>> Hi Jens, >>>> >>>> Please consider pulling the following changes on top of your for-5.20/drivers >>>> branch. The major changes are: >>>> >>>> 1. Improve raid5 lock contention, by Logan Gunthorpe. >>>> 2. Misc fixes to raid5, by Logan Gunthorpe. >>>> 3. Fix race condition with md_reap_sync_thread(), by Guoqing Jiang. >>>> >>> >>> I pulled this in, but what I pulled doesn't match this pull request. >>> There seems to be an extra patch in there, and diffstat doesn't match >>> what is in your email: >>> >>>> MAINTAINERS | 1 + >>>> drivers/md/dm-raid.c | 1 + >>>> drivers/md/md-autodetect.c | 1 + >>>> drivers/md/md-cluster.c | 4 +- >>>> drivers/md/md.c | 76 ++++++++++++++++--------- >>>> drivers/md/md.h | 16 ++++++ >>>> drivers/md/raid5-cache.c | 40 +++++++------ >>>> drivers/md/raid5-log.h | 77 ++++++++++++------------- >>>> drivers/md/raid5-ppl.c | 2 +- >>>> drivers/md/raid5.c | 646 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------- >>>> 10 files changed, 549 insertions(+), 315 deletions(-) >>> >>> MAINTAINERS | 1 + >>> drivers/block/drbd/drbd_bitmap.c | 49 +++- >>> drivers/md/dm-raid.c | 1 + >>> drivers/md/md-autodetect.c | 1 + >>> drivers/md/md-cluster.c | 4 +- >>> drivers/md/md.c | 76 +++-- >>> drivers/md/md.h | 16 ++ >>> drivers/md/raid5-cache.c | 40 ++- >>> drivers/md/raid5-log.h | 77 +++-- >>> drivers/md/raid5-ppl.c | 2 +- >>> drivers/md/raid5.c | 654 +++++++++++++++++++++++++++--------------- >>> 11 files changed, 595 insertions(+), 326 deletions(-) >> >> TUrns out I pulled it into the wrong branch. But even after correcting >> that, I now see: >> >> MAINTAINERS | 1 + >> drivers/md/dm-raid.c | 1 + >> drivers/md/md-autodetect.c | 1 + >> drivers/md/md-cluster.c | 4 +- >> drivers/md/md.c | 76 ++++-- >> drivers/md/md.h | 16 ++ >> drivers/md/raid5-cache.c | 40 ++- >> drivers/md/raid5-log.h | 77 +++--- >> drivers/md/raid5-ppl.c | 2 +- >> drivers/md/raid5.c | 654 +++++++++++++++++++++++++++++++----------------- >> 10 files changed, 553 insertions(+), 319 deletions(-) >> >> which is still off, with the discrepancy being in raid5.c? > > Hmm... I just pulled your for-5.20/drivers branch again, and I am > still getting the original diff: > > MAINTAINERS | 1 + > drivers/md/dm-raid.c | 1 + > drivers/md/md-autodetect.c | 1 + > drivers/md/md-cluster.c | 4 +- > drivers/md/md.c | 76 ++++++++++++------- > drivers/md/md.h | 16 ++++ > drivers/md/raid5-cache.c | 40 +++++----- > drivers/md/raid5-log.h | 77 +++++++++---------- > drivers/md/raid5-ppl.c | 2 +- > drivers/md/raid5.c | 646 ++++++++++++++++++++++++++++++++++++++++++++++++++\ > +++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------\ > ---------------------------- > 10 files changed, 549 insertions(+), 315 deletions(-) > > Is is because different git versions? My current version is git > version 2.30.2. Oh, I think I may know what it is. It's the histrogram vs default diff. I just checked the results and it looks fine. Sorry for the noise, there was nothing wrong with your pull request! Now queued up. -- Jens Axboe
