Skip to contentSkip to conversation

raid5: remove unused variables

PATCH Applied Shaohua Li 2 participants 2 messages Apr 17, 2012 MD RAID

lore
Share & tools
lore

Shaohua Li

author
#0 lore raw

PATCH 1/1 raid5: remove unused variables

The two variables are useless.

Signed-off-by Shaohua Li <[email protected]>
---
 drivers/md/raid5.c |    4 ----
 1 file changed, 4 deletions(-)
drivers/md/raid5.c +0 -4
Index: linux/drivers/md/raid5.c
===================================================================
@@ -3953,12 +3953,10 @@ static void make_request(struct mddev *m
 	plugged = mddev_check_plugged(mddev);
 	for (;logical_sector < last_sector; logical_sector += STRIPE_SECTORS) {
 		DEFINE_WAIT(w);
-		int disks, data_disks;
 		int previous;
 
 	retry:
 		previous = 0;
-		disks = conf->raid_disks;
 		prepare_to_wait(&conf->wait_for_overlap, &w, TASK_UNINTERRUPTIBLE);
 		if (unlikely(conf->reshape_progress != MaxSector)) {
 			/* spinlock is needed as reshape_progress may be

@@ -3973,7 +3971,6 @@ static void make_request(struct mddev *m
 			if (mddev->delta_disks < 0
 			    ? logical_sector < conf->reshape_progress
 			    : logical_sector >= conf->reshape_progress) {
-				disks = conf->previous_raid_disks;
 				previous = 1;
 			} else {
 				if (mddev->delta_disks < 0

@@ -3986,7 +3983,6 @@ static void make_request(struct mddev *m
 			}
 			spin_unlock_irq(&conf->device_lock);
 		}
-		data_disks = disks - conf->max_degraded;
 
 		new_sector = raid5_compute_sector(conf, logical_sector,
 						  previous,
Applied
#1 lore raw
Quoted 34 lines · On Tue, 17 Apr 2012 13:09:26 +0800 Shaohua Li <[email protected]> wrote:

The two variables are useless.

Signed-off-by Shaohua Li <[email protected]>
---
  drivers/md/raid5.c |    4 ----
  1 file changed, 4 deletions(-)

Index: linux/drivers/md/raid5.c
===================================================================

drivers/md/raid5.c +0 -3
@@ -3953,12 +3953,10 @@ static void make_request(struct mddev *m
  	plugged = mddev_check_plugged(mddev);
  	for (;logical_sector < last_sector; logical_sector += STRIPE_SECTORS) {
  		DEFINE_WAIT(w);
-		int disks, data_disks;
  		int previous;
 
  	retry:
  		previous = 0;
-		disks = conf->raid_disks;
  		prepare_to_wait(&conf->wait_for_overlap, &w, TASK_UNINTERRUPTIBLE);
  		if (unlikely(conf->reshape_progress != MaxSector)) {
  			/* spinlock is needed as reshape_progress may be

@@ -3973,7 +3971,6 @@ static void make_request(struct mddev *m
  			if (mddev->delta_disks < 0
  			    ? logical_sector < conf->reshape_progress
  			    : logical_sector >= conf->reshape_progress) {
-				disks = conf->previous_raid_disks;
  				previous = 1;
  			} else {
  				if (mddev->delta_disks < 0

drivers/md/raid5.c static void make_request(struct mddev *m · line 3988

Quoted 7 lines
drivers/md/raid5.c +0 -1
@@ -3986,7 +3983,6 @@ static void make_request(struct mddev *m
  			}
  			spin_unlock_irq(&conf->device_lock);
  		}
-		data_disks = disks - conf->max_degraded;
 
  		new_sector = raid5_compute_sector(conf, logical_sector,
  						  previous,

applied, thanks.

NeilBrown