diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-17 13:51:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-17 13:51:01 -0400 |
commit | 23c1a60e2e9d7d07f5f686e6413fc92bfb84366f (patch) | |
tree | bb1f49058080c1daace69722f464f01836e7ff1a /drivers/md | |
parent | 09df694a65895aa27cd12456ad5e45553e2520f6 (diff) | |
parent | c7a6d35e463caacab08ca0333bdec5b8bdce8bbb (diff) |
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
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/raid5.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 25247a852912..ad1b9bea446e 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -4370,8 +4370,7 @@ static struct stripe_head *__get_priority_stripe(struct r5conf *conf, int group) | |||
4370 | sh->group = NULL; | 4370 | sh->group = NULL; |
4371 | } | 4371 | } |
4372 | list_del_init(&sh->lru); | 4372 | list_del_init(&sh->lru); |
4373 | atomic_inc(&sh->count); | 4373 | BUG_ON(atomic_inc_return(&sh->count) != 1); |
4374 | BUG_ON(atomic_read(&sh->count) != 1); | ||
4375 | return sh; | 4374 | return sh; |
4376 | } | 4375 | } |
4377 | 4376 | ||