From 354b445b5f84f72e64cef9ffe175548e84c1a874 Mon Sep 17 00:00:00 2001 From: Shaohua Li Date: Wed, 16 Nov 2016 17:20:19 -0800 Subject: raid5-cache: fix lockdep warning lockdep reports warning of the rcu_dereference usage. Using normal rdev access pattern to avoid the warning. Signed-off-by: Shaohua Li --- drivers/md/raid5-cache.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'drivers/md') diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c index 2e270e69c550..f73672b0a702 100644 --- a/drivers/md/raid5-cache.c +++ b/drivers/md/raid5-cache.c @@ -970,16 +970,28 @@ static int r5l_recovery_flush_one_stripe(struct r5l_log *log, continue; /* in case device is broken */ + rcu_read_lock(); rdev = rcu_dereference(conf->disks[disk_index].rdev); - if (rdev) + if (rdev) { + atomic_inc(&rdev->nr_pending); + rcu_read_unlock(); sync_page_io(rdev, stripe_sect, PAGE_SIZE, sh->dev[disk_index].page, REQ_OP_WRITE, 0, false); + rdev_dec_pending(rdev, rdev->mddev); + rcu_read_lock(); + } rrdev = rcu_dereference(conf->disks[disk_index].replacement); - if (rrdev) + if (rrdev) { + atomic_inc(&rrdev->nr_pending); + rcu_read_unlock(); sync_page_io(rrdev, stripe_sect, PAGE_SIZE, sh->dev[disk_index].page, REQ_OP_WRITE, 0, false); + rdev_dec_pending(rrdev, rrdev->mddev); + rcu_read_lock(); + } + rcu_read_unlock(); } raid5_release_stripe(sh); return 0; -- cgit v1.2.3