Dan Williams 2339788376 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>
2008-07-23 13:09:45 -07:00
..
2006-01-01 22:21:50 +01:00
2007-10-20 02:01:11 +01:00
2008-07-02 09:34:28 +01:00
2007-10-20 02:01:11 +01:00
2008-04-25 13:26:55 +01:00
2007-10-20 02:01:07 +01:00
2007-10-20 02:01:18 +01:00
2008-04-25 13:26:57 +01:00
2008-02-08 02:10:16 +00:00
2008-04-25 13:26:57 +01:00
2008-04-25 13:26:55 +01:00
2008-02-08 02:10:35 +00:00
2007-10-20 02:01:07 +01:00
2008-04-25 13:26:57 +01:00
2008-04-25 13:26:55 +01:00
2008-04-25 13:26:44 +01:00
2008-02-08 02:11:24 +00:00
2007-10-20 02:01:07 +01:00
2007-10-20 02:01:26 +01:00
2008-04-25 13:26:53 +01:00
2008-02-08 02:10:32 +00:00
2008-04-25 13:26:55 +01:00
2008-02-06 10:41:18 -08:00
2008-07-23 13:09:45 -07:00
2005-09-17 11:49:58 -07:00
2005-09-17 11:49:58 -07:00
2007-10-29 07:41:32 -07:00
2007-10-29 07:41:32 -07:00
2007-10-29 07:41:32 -07:00
2007-10-29 07:41:32 -07:00