aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/raid5.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2009-03-31 00:27:05 -0400
committerNeilBrown <neilb@suse.de>2009-03-31 00:27:05 -0400
commit2cffc4a01dd90a502324e3453d7b245d6d16e1c2 (patch)
treebcaf6e9fb8169c4e863173d33624de4c9a181246 /drivers/md/raid5.c
parentab69ae12ceef7f23c578a3c230144e94a167a821 (diff)
md: remove CONFIG_MD_RAID_RESHAPE config option.
This was only needed when the code was experimental. Most of it is well tested now, so the option is no longer useful. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r--drivers/md/raid5.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 062df846fd62..fb11c13eb69c 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -948,7 +948,6 @@ static int grow_stripes(raid5_conf_t *conf, int num)
948 return 0; 948 return 0;
949} 949}
950 950
951#ifdef CONFIG_MD_RAID5_RESHAPE
952static int resize_stripes(raid5_conf_t *conf, int newsize) 951static int resize_stripes(raid5_conf_t *conf, int newsize)
953{ 952{
954 /* Make all the stripes able to hold 'newsize' devices. 953 /* Make all the stripes able to hold 'newsize' devices.
@@ -1073,7 +1072,6 @@ static int resize_stripes(raid5_conf_t *conf, int newsize)
1073 conf->pool_size = newsize; 1072 conf->pool_size = newsize;
1074 return err; 1073 return err;
1075} 1074}
1076#endif
1077 1075
1078static int drop_one_stripe(raid5_conf_t *conf) 1076static int drop_one_stripe(raid5_conf_t *conf)
1079{ 1077{
@@ -4822,7 +4820,6 @@ static int raid5_resize(mddev_t *mddev, sector_t sectors)
4822 return 0; 4820 return 0;
4823} 4821}
4824 4822
4825#ifdef CONFIG_MD_RAID5_RESHAPE
4826static int raid5_check_reshape(mddev_t *mddev) 4823static int raid5_check_reshape(mddev_t *mddev)
4827{ 4824{
4828 raid5_conf_t *conf = mddev_to_conf(mddev); 4825 raid5_conf_t *conf = mddev_to_conf(mddev);
@@ -4967,7 +4964,6 @@ static int raid5_start_reshape(mddev_t *mddev)
4967 md_new_event(mddev); 4964 md_new_event(mddev);
4968 return 0; 4965 return 0;
4969} 4966}
4970#endif
4971 4967
4972/* This is called from the reshape thread and should make any 4968/* This is called from the reshape thread and should make any
4973 * changes needed in 'conf' 4969 * changes needed in 'conf'
@@ -5289,11 +5285,9 @@ static struct mdk_personality raid6_personality =
5289 .sync_request = sync_request, 5285 .sync_request = sync_request,
5290 .resize = raid5_resize, 5286 .resize = raid5_resize,
5291 .size = raid5_size, 5287 .size = raid5_size,
5292#ifdef CONFIG_MD_RAID5_RESHAPE
5293 .check_reshape = raid5_check_reshape, 5288 .check_reshape = raid5_check_reshape,
5294 .start_reshape = raid5_start_reshape, 5289 .start_reshape = raid5_start_reshape,
5295 .finish_reshape = raid5_finish_reshape, 5290 .finish_reshape = raid5_finish_reshape,
5296#endif
5297 .quiesce = raid5_quiesce, 5291 .quiesce = raid5_quiesce,
5298 .takeover = raid6_takeover, 5292 .takeover = raid6_takeover,
5299 .reconfig = raid6_reconfig, 5293 .reconfig = raid6_reconfig,
@@ -5314,11 +5308,9 @@ static struct mdk_personality raid5_personality =
5314 .sync_request = sync_request, 5308 .sync_request = sync_request,
5315 .resize = raid5_resize, 5309 .resize = raid5_resize,
5316 .size = raid5_size, 5310 .size = raid5_size,
5317#ifdef CONFIG_MD_RAID5_RESHAPE
5318 .check_reshape = raid5_check_reshape, 5311 .check_reshape = raid5_check_reshape,
5319 .start_reshape = raid5_start_reshape, 5312 .start_reshape = raid5_start_reshape,
5320 .finish_reshape = raid5_finish_reshape, 5313 .finish_reshape = raid5_finish_reshape,
5321#endif
5322 .quiesce = raid5_quiesce, 5314 .quiesce = raid5_quiesce,
5323 .takeover = raid5_takeover, 5315 .takeover = raid5_takeover,
5324 .reconfig = raid5_reconfig, 5316 .reconfig = raid5_reconfig,
@@ -5340,11 +5332,9 @@ static struct mdk_personality raid4_personality =
5340 .sync_request = sync_request, 5332 .sync_request = sync_request,
5341 .resize = raid5_resize, 5333 .resize = raid5_resize,
5342 .size = raid5_size, 5334 .size = raid5_size,
5343#ifdef CONFIG_MD_RAID5_RESHAPE
5344 .check_reshape = raid5_check_reshape, 5335 .check_reshape = raid5_check_reshape,
5345 .start_reshape = raid5_start_reshape, 5336 .start_reshape = raid5_start_reshape,
5346 .finish_reshape = raid5_finish_reshape, 5337 .finish_reshape = raid5_finish_reshape,
5347#endif
5348 .quiesce = raid5_quiesce, 5338 .quiesce = raid5_quiesce,
5349}; 5339};
5350 5340