aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2008-07-23 23:05:34 -0400
committerDan Williams <dan.j.williams@intel.com>2008-07-23 16:09:45 -0400
commit2339788376e2d69a9154130e4dacd5b21ce63094 (patch)
treeed8f21a7a726472fd089365b8913f0e950edf12a /CREDITS
parentc9f21aaff1d1fb5629325130af469532d19beb93 (diff)
md: fix merge error
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: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions