aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/raid5.c
diff options
context:
space:
mode:
authorShaohua Li <shli@kernel.org>2013-08-28 02:29:05 -0400
committerNeilBrown <neilb@suse.de>2013-08-28 02:36:26 -0400
commitd265d9dc1d25a69affc21ae9fe5004b9d09c10ef (patch)
tree13454c2047b4f2f57d9df7390f325a7820d0ace1 /drivers/md/raid5.c
parent773ca82fa1ee58dd1bf88b6a5ca385ec83a2cac6 (diff)
raid5: fix stripe release order
patch "make release_stripe lockless" changes the order stripes are released. Originally I thought block layer can take care of request merge, but it appears there are still some requests not merged. It's easy to fix the order. Signed-off-by: Shaohua Li <shli@fusionio.com> Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r--drivers/md/raid5.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 287cc3b30043..d87a2de667ea 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -239,6 +239,20 @@ static void __release_stripe(struct r5conf *conf, struct stripe_head *sh)
239 do_release_stripe(conf, sh); 239 do_release_stripe(conf, sh);
240} 240}
241 241
242static struct llist_node *llist_reverse_order(struct llist_node *head)
243{
244 struct llist_node *new_head = NULL;
245
246 while (head) {
247 struct llist_node *tmp = head;
248 head = head->next;
249 tmp->next = new_head;
250 new_head = tmp;
251 }
252
253 return new_head;
254}
255
242/* should hold conf->device_lock already */ 256/* should hold conf->device_lock already */
243static int release_stripe_list(struct r5conf *conf) 257static int release_stripe_list(struct r5conf *conf)
244{ 258{
@@ -247,6 +261,7 @@ static int release_stripe_list(struct r5conf *conf)
247 struct llist_node *head; 261 struct llist_node *head;
248 262
249 head = llist_del_all(&conf->released_stripes); 263 head = llist_del_all(&conf->released_stripes);
264 head = llist_reverse_order(head);
250 while (head) { 265 while (head) {
251 sh = llist_entry(head, struct stripe_head, release_list); 266 sh = llist_entry(head, struct stripe_head, release_list);
252 head = llist_next(head); 267 head = llist_next(head);