Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad1fca20 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://neil.brown.name/md 

* 'for-linus' of git://neil.brown.name/md:
  md/bitmap: It is OK to clear bits during recovery.
  md: don't give up looking for spares on first failure-to-add
  md/raid5: ensure correct assessment of drives during degraded reshape.
  md/linear: fix hot-add of devices to linear arrays.
parents b3b1b70e 961902c0

drivers/md/bitmap.c

+1 −4
Original line number Diff line number Diff line
@@ -1393,9 +1393,6 @@ void bitmap_endwrite(struct bitmap *bitmap, sector_t offset, unsigned long secto 
			 atomic_read(&bitmap->behind_writes),

			 bitmap->mddev->bitmap_info.max_write_behind);

	}

	if (bitmap->mddev->degraded)

		/* Never clear bits or update events_cleared when degraded */

		success = 0;



	while (sectors) {

		sector_t blocks;
@@ -1409,7 +1406,7 @@ void bitmap_endwrite(struct bitmap *bitmap, sector_t offset, unsigned long secto 
			return;

		}



		if (success &&

		if (success && !bitmap->mddev->degraded &&

		    bitmap->events_cleared < bitmap->mddev->events) {

			bitmap->events_cleared = bitmap->mddev->events;

			bitmap->need_sync = 1;

drivers/md/linear.c

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ static int linear_add(struct mddev *mddev, struct md_rdev *rdev) 
		return -EINVAL;



	rdev->raid_disk = rdev->saved_raid_disk;

	rdev->saved_raid_disk = -1;



	newconf = linear_conf(mddev,mddev->raid_disks+1);

drivers/md/md.c

+1 −2
Original line number Diff line number Diff line
@@ -7360,8 +7360,7 @@ static int remove_and_add_spares(struct mddev *mddev) 
					spares++;

					md_new_event(mddev);

					set_bit(MD_CHANGE_DEVS, &mddev->flags);

				} else

					break;

				}

			}

		}

	}

drivers/md/raid5.c

+10 −4
Original line number Diff line number Diff line
@@ -3065,11 +3065,17 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s) 
			}

		} else if (test_bit(In_sync, &rdev->flags))

			set_bit(R5_Insync, &dev->flags);

		else {

		else if (sh->sector + STRIPE_SECTORS <= rdev->recovery_offset)

			/* in sync if before recovery_offset */

			if (sh->sector + STRIPE_SECTORS <= rdev->recovery_offset)

			set_bit(R5_Insync, &dev->flags);

		}

		else if (test_bit(R5_UPTODATE, &dev->flags) &&

			 test_bit(R5_Expanded, &dev->flags))

			/* If we've reshaped into here, we assume it is Insync.

			 * We will shortly update recovery_offset to make

			 * it official.

			 */

			set_bit(R5_Insync, &dev->flags);



		if (rdev && test_bit(R5_WriteError, &dev->flags)) {

			clear_bit(R5_Insync, &dev->flags);

			if (!test_bit(Faulty, &rdev->flags)) {