@@ -155,7 +155,7 @@ static int raid6_idx_to_slot(int idx, struct stripe_head *sh,
155
155
return slot ;
156
156
}
157
157
158
- static void print_raid5_conf (struct r5conf * conf );
158
+ static void print_raid5_conf (struct r5conf * conf );
159
159
160
160
static int stripe_operations_active (struct stripe_head * sh )
161
161
{
@@ -7568,11 +7568,11 @@ static struct r5conf *setup_conf(struct mddev *mddev)
7568
7568
if (test_bit (Replacement , & rdev -> flags )) {
7569
7569
if (disk -> replacement )
7570
7570
goto abort ;
7571
- RCU_INIT_POINTER ( disk -> replacement , rdev ) ;
7571
+ disk -> replacement = rdev ;
7572
7572
} else {
7573
7573
if (disk -> rdev )
7574
7574
goto abort ;
7575
- RCU_INIT_POINTER ( disk -> rdev , rdev ) ;
7575
+ disk -> rdev = rdev ;
7576
7576
}
7577
7577
7578
7578
if (test_bit (In_sync , & rdev -> flags )) {
@@ -8054,7 +8054,7 @@ static void raid5_status(struct seq_file *seq, struct mddev *mddev)
8054
8054
seq_printf (seq , "]" );
8055
8055
}
8056
8056
8057
- static void print_raid5_conf (struct r5conf * conf )
8057
+ static void print_raid5_conf (struct r5conf * conf )
8058
8058
{
8059
8059
struct md_rdev * rdev ;
8060
8060
int i ;
@@ -8068,15 +8068,13 @@ static void print_raid5_conf (struct r5conf *conf)
8068
8068
conf -> raid_disks ,
8069
8069
conf -> raid_disks - conf -> mddev -> degraded );
8070
8070
8071
- rcu_read_lock ();
8072
8071
for (i = 0 ; i < conf -> raid_disks ; i ++ ) {
8073
- rdev = rcu_dereference ( conf -> disks [i ].rdev ) ;
8072
+ rdev = conf -> disks [i ].rdev ;
8074
8073
if (rdev )
8075
8074
pr_debug (" disk %d, o:%d, dev:%pg\n" ,
8076
8075
i , !test_bit (Faulty , & rdev -> flags ),
8077
8076
rdev -> bdev );
8078
8077
}
8079
- rcu_read_unlock ();
8080
8078
}
8081
8079
8082
8080
static int raid5_spare_active (struct mddev * mddev )
0 commit comments