[patch] raid5_end_write_request spinlock fix

[patch] raid5_end_write_request spinlock fix

[Qi Yong]

Hello,

Reduce the raid5_end_write_request() spinlock window.

Signed-off-by: Coywolf Qi Hunt <qiyong@fc-cn.com>
---

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 3184360..9c24377 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -581,7 +581,6 @@ static int raid5_end_write_request (stru
  	struct stripe_head *sh = bi->bi_private;
 	raid5_conf_t *conf = sh->raid_conf;
 	int disks = sh->disks, i;
-	unsigned long flags;
 	int uptodate = test_bit(BIO_UPTODATE, &bi->bi_flags);
 
 	if (bi->bi_size)
@@ -599,16 +598,14 @@ static int raid5_end_write_request (stru
 		return 0;
 	}
 
-	spin_lock_irqsave(&conf->device_lock, flags);
 	if (!uptodate)
 		md_error(conf->mddev, conf->disks[i].rdev);
 
 	rdev_dec_pending(conf->disks[i].rdev, conf->mddev);
-	
 	clear_bit(R5_LOCKED, &sh->dev[i].flags);
 	set_bit(STRIPE_HANDLE, &sh->state);
-	__release_stripe(conf, sh);
-	spin_unlock_irqrestore(&conf->device_lock, flags);
+	release_stripe(sh);
+
 	return 0;
 }
 

-- 
Coywolf Qi Hunt

Re: [patch] raid5_end_write_request spinlock fix

[Neil Brown]

On Friday April 21, qiyong@fc-cn.com wrote:
> Hello,
> 
> Reduce the raid5_end_write_request() spinlock window.

Thank you for reviewing the md code and suggesting improvements.
However it would help if you used a few more words to describe your
patches.  E.g. explain why  you are convinced that it is safe to
reduce the range of the lock like this.

NeilBrown

> 
> Signed-off-by: Coywolf Qi Hunt <qiyong@fc-cn.com>
> ---
> 
> diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
> index 3184360..9c24377 100644
> --- a/drivers/md/raid5.c
> +++ b/drivers/md/raid5.c
> @@ -581,7 +581,6 @@ static int raid5_end_write_request (stru
>   	struct stripe_head *sh = bi->bi_private;
>  	raid5_conf_t *conf = sh->raid_conf;
>  	int disks = sh->disks, i;
> -	unsigned long flags;
>  	int uptodate = test_bit(BIO_UPTODATE, &bi->bi_flags);
>  
>  	if (bi->bi_size)
> @@ -599,16 +598,14 @@ static int raid5_end_write_request (stru
>  		return 0;
>  	}
>  
> -	spin_lock_irqsave(&conf->device_lock, flags);
>  	if (!uptodate)
>  		md_error(conf->mddev, conf->disks[i].rdev);
>  
>  	rdev_dec_pending(conf->disks[i].rdev, conf->mddev);
> -	
>  	clear_bit(R5_LOCKED, &sh->dev[i].flags);
>  	set_bit(STRIPE_HANDLE, &sh->state);
> -	__release_stripe(conf, sh);
> -	spin_unlock_irqrestore(&conf->device_lock, flags);
> +	release_stripe(sh);
> +
>  	return 0;
>  }
>  
> 
> -- 
> Coywolf Qi Hunt