aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackieLiu <liuyun01@kylinos.cn>2016-11-28 03:19:18 -0500
committerShaohua Li <shli@fb.com>2016-11-29 17:46:21 -0500
commit9b69173e5c6000b2c6fafc5085dcd7b173f073c8 (patch)
tree4205b1365b0ef87006c2235a7e0bf9f23488926d
parent462eb7d87297dae5837f3445b68b79e835ab0d6c (diff)
md/raid5-cache: remove unnecessary function parameters
The function parameter 'recovery_list' is not used in body, we can delete it Signed-off-by: JackieLiu <liuyun01@kylinos.cn> Reviewed-by: Song Liu <songliubraving@fb.com> Signed-off-by: Shaohua Li <shli@fb.com>
-rw-r--r--drivers/md/raid5-cache.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index b34b26dd3e45..1842ecbf95a1 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -67,7 +67,7 @@ static char *r5c_journal_mode_str[] = {"write-through",
67/* 67/*
68 * raid5 cache state machine 68 * raid5 cache state machine
69 * 69 *
70 * With rhe RAID cache, each stripe works in two phases: 70 * With the RAID cache, each stripe works in two phases:
71 * - caching phase 71 * - caching phase
72 * - writing-out phase 72 * - writing-out phase
73 * 73 *
@@ -1674,7 +1674,6 @@ out:
1674 1674
1675static struct stripe_head * 1675static struct stripe_head *
1676r5c_recovery_alloc_stripe(struct r5conf *conf, 1676r5c_recovery_alloc_stripe(struct r5conf *conf,
1677 struct list_head *recovery_list,
1678 sector_t stripe_sect, 1677 sector_t stripe_sect,
1679 sector_t log_start) 1678 sector_t log_start)
1680{ 1679{
@@ -1855,8 +1854,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log,
1855 stripe_sect); 1854 stripe_sect);
1856 1855
1857 if (!sh) { 1856 if (!sh) {
1858 sh = r5c_recovery_alloc_stripe(conf, cached_stripe_list, 1857 sh = r5c_recovery_alloc_stripe(conf, stripe_sect, ctx->pos);
1859 stripe_sect, ctx->pos);
1860 /* 1858 /*
1861 * cannot get stripe from raid5_get_active_stripe 1859 * cannot get stripe from raid5_get_active_stripe
1862 * try replay some stripes 1860 * try replay some stripes
@@ -1865,8 +1863,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log,
1865 r5c_recovery_replay_stripes( 1863 r5c_recovery_replay_stripes(
1866 cached_stripe_list, ctx); 1864 cached_stripe_list, ctx);
1867 sh = r5c_recovery_alloc_stripe( 1865 sh = r5c_recovery_alloc_stripe(
1868 conf, cached_stripe_list, 1866 conf, stripe_sect, ctx->pos);
1869 stripe_sect, ctx->pos);
1870 } 1867 }
1871 if (!sh) { 1868 if (!sh) {
1872 pr_debug("md/raid:%s: Increasing stripe cache size to %d to recovery data on journal.\n", 1869 pr_debug("md/raid:%s: Increasing stripe cache size to %d to recovery data on journal.\n",
@@ -1875,8 +1872,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log,
1875 raid5_set_cache_size(mddev, 1872 raid5_set_cache_size(mddev,
1876 conf->min_nr_stripes * 2); 1873 conf->min_nr_stripes * 2);
1877 sh = r5c_recovery_alloc_stripe( 1874 sh = r5c_recovery_alloc_stripe(
1878 conf, cached_stripe_list, stripe_sect, 1875 conf, stripe_sect, ctx->pos);
1879 ctx->pos);
1880 } 1876 }
1881 if (!sh) { 1877 if (!sh) {
1882 pr_err("md/raid:%s: Cannot get enough stripes due to memory pressure. Recovery failed.\n", 1878 pr_err("md/raid:%s: Cannot get enough stripes due to memory pressure. Recovery failed.\n",