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

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

Merge tag 'md/4.3-rc4-fix' of git://neil.brown.name/md 

Pull md bugfix from Neil Brown:
 "One bug fix for raid1/raid10.

  Very careless bug earler in 4.3-rc, now fixed :-)"

* tag 'md/4.3-rc4-fix' of git://neil.brown.name/md:
  crash in md-raid1 and md-raid10 due to incorrect list manipulation
parents 4a06c8ac a452744b

drivers/md/raid1.c

+2 −2
Original line number Diff line number Diff line
@@ -2382,8 +2382,8 @@ static void raid1d(struct md_thread *thread) 
		}

		spin_unlock_irqrestore(&conf->device_lock, flags);

		while (!list_empty(&tmp)) {

			r1_bio = list_first_entry(&conf->bio_end_io_list,

						  struct r1bio, retry_list);

			r1_bio = list_first_entry(&tmp, struct r1bio,

						  retry_list);

			list_del(&r1_bio->retry_list);

			raid_end_bio_io(r1_bio);

		}

drivers/md/raid10.c

+2 −2
Original line number Diff line number Diff line
@@ -2688,8 +2688,8 @@ static void raid10d(struct md_thread *thread) 
		}

		spin_unlock_irqrestore(&conf->device_lock, flags);

		while (!list_empty(&tmp)) {

			r10_bio = list_first_entry(&conf->bio_end_io_list,

						  struct r10bio, retry_list);

			r10_bio = list_first_entry(&tmp, struct r10bio,

						   retry_list);

			list_del(&r10_bio->retry_list);

			raid_end_bio_io(r10_bio);

		}