lkml.org 
[lkml]   [2019]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] btrfs: raid56: remove set but not used variable 'p_stripe'
Date
Fixes gcc '-Wunused-but-set-variable' warning:

fs/btrfs/raid56.c: In function ‘finish_rmw’:
fs/btrfs/raid56.c:1199:6: warning: variable ‘p_stripe’ set
but not used [-Wunused-but-set-variable]
fs/btrfs/raid56.c: In function ‘finish_parity_scrub’:
fs/btrfs/raid56.c:2356:6: warning: variable ‘p_stripe’ set
but not used [-Wunused-but-set-variable]

Signed-off-by: yu kuai <yukuai3@huawei.com>
---
fs/btrfs/raid56.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index a8e53c8e7b01..b59999b02516 100644
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -1196,7 +1196,6 @@ static noinline void finish_rmw(struct btrfs_raid_bio *rbio)
int nr_data = rbio->nr_data;
int stripe;
int pagenr;
- int p_stripe = -1;
int q_stripe = -1;
struct bio_list bio_list;
struct bio *bio;
@@ -1204,14 +1203,10 @@ static noinline void finish_rmw(struct btrfs_raid_bio *rbio)

bio_list_init(&bio_list);

- if (rbio->real_stripes - rbio->nr_data == 1) {
- p_stripe = rbio->real_stripes - 1;
- } else if (rbio->real_stripes - rbio->nr_data == 2) {
- p_stripe = rbio->real_stripes - 2;
+ if (rbio->real_stripes - rbio->nr_data == 2)
q_stripe = rbio->real_stripes - 1;
- } else {
+ else if (rbio->real_stripes - rbio->nr_data != 1)
BUG();
- }

/* at this point we either have a full stripe,
* or we've read the full stripe from the drive.
@@ -2353,7 +2348,6 @@ static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio,
int nr_data = rbio->nr_data;
int stripe;
int pagenr;
- int p_stripe = -1;
int q_stripe = -1;
struct page *p_page = NULL;
struct page *q_page = NULL;
@@ -2364,14 +2358,10 @@ static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio,

bio_list_init(&bio_list);

- if (rbio->real_stripes - rbio->nr_data == 1) {
- p_stripe = rbio->real_stripes - 1;
- } else if (rbio->real_stripes - rbio->nr_data == 2) {
- p_stripe = rbio->real_stripes - 2;
+ if (rbio->real_stripes - rbio->nr_data == 2)
q_stripe = rbio->real_stripes - 1;
- } else {
+ else if (rbio->real_stripes - rbio->nr_data != 1)
BUG();
- }

if (bbio->num_tgtdevs && bbio->tgtdev_map[rbio->scrubp]) {
is_replace = 1;
--
2.17.2
\
 
 \ /
  Last update: 2019-12-13 13:09    [W:0.025 / U:30.516 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site