]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
raid5: don't duplicate code for different paths in handle_stripe
authorGuoqing Jiang <guoqing.jiang@cloud.ionos.com>
Tue, 28 Jul 2020 10:01:43 +0000 (12:01 +0200)
committerSong Liu <songliubraving@fb.com>
Mon, 3 Aug 2020 06:03:52 +0000 (23:03 -0700)
As we can see, R5_LOCKED is set and s.locked is increased whether
R5_ReWrite is set or not, so move it to common path.

Signed-off-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Signed-off-by: Song Liu <songliubraving@fb.com>
drivers/md/raid5.c

index 790d91aa5f40ca7f875c35fe66dcb4d572dc7497..b06edfaa73b0f19723d2bbd3b16dafe9df0bc15d 100644 (file)
@@ -4966,14 +4966,11 @@ static void handle_stripe(struct stripe_head *sh)
                                if (!test_bit(R5_ReWrite, &dev->flags)) {
                                        set_bit(R5_Wantwrite, &dev->flags);
                                        set_bit(R5_ReWrite, &dev->flags);
-                                       set_bit(R5_LOCKED, &dev->flags);
-                                       s.locked++;
-                               } else {
+                               } else
                                        /* let's read it back */
                                        set_bit(R5_Wantread, &dev->flags);
-                                       set_bit(R5_LOCKED, &dev->flags);
-                                       s.locked++;
-                               }
+                               set_bit(R5_LOCKED, &dev->flags);
+                               s.locked++;
                        }
                }