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

Commit 23c1a60e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '3.15-fixes' of git://neil.brown.name/md 

Pull md bugfix from Neil Brown:
 "One BUG fix for md for recent commit"

* tag '3.15-fixes' of git://neil.brown.name/md:
  raid5: fix a race of stripe count check
parents 09df694a c7a6d35e

drivers/md/raid5.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -4370,8 +4370,7 @@ static struct stripe_head *__get_priority_stripe(struct r5conf *conf, int group) 
		sh->group = NULL;

		sh->group = NULL;

	}

	}

	list_del_init(&sh->lru);

	list_del_init(&sh->lru);

	atomic_inc(&sh->count);

	BUG_ON(atomic_inc_return(&sh->count) != 1);

	BUG_ON(atomic_read(&sh->count) != 1);

	return sh;

	return sh;

}

}