From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 01:26:11 +0000 (+1100)
Subject: Merge remote-tracking branch 'md/for-next'
X-Git-Tag: KARO-TXUL-2015-12-04~84
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=8fc781f6d45291fde1bf1ff70fa29a18fd4d30d7

Merge remote-tracking branch 'md/for-next'
---

8fc781f6d45291fde1bf1ff70fa29a18fd4d30d7
diff --cc drivers/md/raid5.c
index 45933c160697,e5befa356dbe..704ef7fcfbf8
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@@ -3497,9 -3504,11 +3504,12 @@@ returnbi
  			WARN_ON(test_bit(R5_SkipCopy, &dev->flags));
  			WARN_ON(dev->page != dev->orig_page);
  		}
+ 
+ 	r5l_stripe_write_finished(sh);
+ 
  	if (!discard_pending &&
  	    test_bit(R5_Discard, &sh->dev[sh->pd_idx].flags)) {
 +		int hash;
  		clear_bit(R5_Discard, &sh->dev[sh->pd_idx].flags);
  		clear_bit(R5_UPTODATE, &sh->dev[sh->pd_idx].flags);
  		if (sh->qd_idx >= 0) {