Skip to content
  • Dan Williams's avatar
    md: fix merge error · 23397883
    Dan Williams authored
    
    
    The original STRIPE_OP_IO removal patch had the following hunk:
    
    -               for (i = conf->raid_disks; i--; ) {
    +               for (i = conf->raid_disks; i--; )
                            set_bit(R5_Wantwrite, &sh->dev[i].flags);
    -                       if (!test_and_set_bit(STRIPE_OP_IO, &sh->ops.pending))
    -                               sh->ops.count++;
    -               }
    
    However it appears the hunk became broken after merging:
    -               for (i = conf->raid_disks; i--; ) {
    +               for (i = conf->raid_disks; i--; )
                            set_bit(R5_Wantwrite, &sh->dev[i].flags);
                            set_bit(R5_LOCKED, &dev->flags);
                            s.locked++;
    -                       if (!test_and_set_bit(STRIPE_OP_IO, &sh->ops.pending))
    -                               sh->ops.count++;
    -               }
    
    Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
    23397883