Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

md/raid5: rename wait_for_overlap to wait_for_reshape

The only remaining uses of wait_for_overlap are related to reshape so
rename it accordingly.

Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Link: https://lore.kernel.org/r/20240827153536.6743-4-artur.paszkiewicz@intel.com
Signed-off-by: Song Liu <song@kernel.org>

authored by

Artur Paszkiewicz and committed by
Song Liu
6f039cc4 0e4aac73

+14 -14
+13 -13
drivers/md/raid5.c
··· 5257 5257 } else if (s.expanded && !sh->reconstruct_state && s.locked == 0) { 5258 5258 clear_bit(STRIPE_EXPAND_READY, &sh->state); 5259 5259 atomic_dec(&conf->reshape_stripes); 5260 - wake_up(&conf->wait_for_overlap); 5260 + wake_up(&conf->wait_for_reshape); 5261 5261 md_done_sync(conf->mddev, RAID5_STRIPE_SECTORS(conf), 1); 5262 5262 } 5263 5263 ··· 6148 6148 logical_sector = raid5_bio_lowest_chunk_sector(conf, bi); 6149 6149 on_wq = false; 6150 6150 } else { 6151 - add_wait_queue(&conf->wait_for_overlap, &wait); 6151 + add_wait_queue(&conf->wait_for_reshape, &wait); 6152 6152 on_wq = true; 6153 6153 } 6154 6154 s = (logical_sector - ctx.first_sector) >> RAID5_STRIPE_SHIFT(conf); ··· 6189 6189 (s << RAID5_STRIPE_SHIFT(conf)); 6190 6190 } 6191 6191 if (unlikely(on_wq)) 6192 - remove_wait_queue(&conf->wait_for_overlap, &wait); 6192 + remove_wait_queue(&conf->wait_for_reshape, &wait); 6193 6193 6194 6194 if (ctx.batch_last) 6195 6195 raid5_release_stripe(ctx.batch_last); ··· 6342 6342 : (safepos < writepos && readpos > writepos)) || 6343 6343 time_after(jiffies, conf->reshape_checkpoint + 10*HZ)) { 6344 6344 /* Cannot proceed until we've updated the superblock... */ 6345 - wait_event(conf->wait_for_overlap, 6345 + wait_event(conf->wait_for_reshape, 6346 6346 atomic_read(&conf->reshape_stripes)==0 6347 6347 || test_bit(MD_RECOVERY_INTR, &mddev->recovery)); 6348 6348 if (atomic_read(&conf->reshape_stripes) != 0) ··· 6368 6368 spin_lock_irq(&conf->device_lock); 6369 6369 conf->reshape_safe = mddev->reshape_position; 6370 6370 spin_unlock_irq(&conf->device_lock); 6371 - wake_up(&conf->wait_for_overlap); 6371 + wake_up(&conf->wait_for_reshape); 6372 6372 sysfs_notify_dirent_safe(mddev->sysfs_completed); 6373 6373 } 6374 6374 ··· 6451 6451 (sector_nr - mddev->curr_resync_completed) * 2 6452 6452 >= mddev->resync_max - mddev->curr_resync_completed) { 6453 6453 /* Cannot proceed until we've updated the superblock... */ 6454 - wait_event(conf->wait_for_overlap, 6454 + wait_event(conf->wait_for_reshape, 6455 6455 atomic_read(&conf->reshape_stripes) == 0 6456 6456 || test_bit(MD_RECOVERY_INTR, &mddev->recovery)); 6457 6457 if (atomic_read(&conf->reshape_stripes) != 0) ··· 6477 6477 spin_lock_irq(&conf->device_lock); 6478 6478 conf->reshape_safe = mddev->reshape_position; 6479 6479 spin_unlock_irq(&conf->device_lock); 6480 - wake_up(&conf->wait_for_overlap); 6480 + wake_up(&conf->wait_for_reshape); 6481 6481 sysfs_notify_dirent_safe(mddev->sysfs_completed); 6482 6482 } 6483 6483 ret: ··· 6512 6512 } 6513 6513 6514 6514 /* Allow raid5_quiesce to complete */ 6515 - wait_event(conf->wait_for_overlap, conf->quiesce != 2); 6515 + wait_event(conf->wait_for_reshape, conf->quiesce != 2); 6516 6516 6517 6517 if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)) 6518 6518 return reshape_request(mddev, sector_nr, skipped); ··· 7498 7498 7499 7499 init_waitqueue_head(&conf->wait_for_quiescent); 7500 7500 init_waitqueue_head(&conf->wait_for_stripe); 7501 - init_waitqueue_head(&conf->wait_for_overlap); 7501 + init_waitqueue_head(&conf->wait_for_reshape); 7502 7502 INIT_LIST_HEAD(&conf->handle_list); 7503 7503 INIT_LIST_HEAD(&conf->loprio_list); 7504 7504 INIT_LIST_HEAD(&conf->hold_list); ··· 8557 8557 !test_bit(In_sync, &rdev->flags)) 8558 8558 rdev->recovery_offset = MaxSector; 8559 8559 spin_unlock_irq(&conf->device_lock); 8560 - wake_up(&conf->wait_for_overlap); 8560 + wake_up(&conf->wait_for_reshape); 8561 8561 8562 8562 mddev_update_io_opt(conf->mddev, 8563 8563 conf->raid_disks - conf->max_degraded); ··· 8621 8621 conf->quiesce = 1; 8622 8622 unlock_all_device_hash_locks_irq(conf); 8623 8623 /* allow reshape to continue */ 8624 - wake_up(&conf->wait_for_overlap); 8624 + wake_up(&conf->wait_for_reshape); 8625 8625 } else { 8626 8626 /* re-enable writes */ 8627 8627 lock_all_device_hash_locks_irq(conf); 8628 8628 conf->quiesce = 0; 8629 8629 wake_up(&conf->wait_for_quiescent); 8630 - wake_up(&conf->wait_for_overlap); 8630 + wake_up(&conf->wait_for_reshape); 8631 8631 unlock_all_device_hash_locks_irq(conf); 8632 8632 } 8633 8633 log_quiesce(conf, quiesce); ··· 8946 8946 { 8947 8947 struct r5conf *conf = mddev->private; 8948 8948 8949 - wake_up(&conf->wait_for_overlap); 8949 + wake_up(&conf->wait_for_reshape); 8950 8950 } 8951 8951 8952 8952 static struct md_personality raid6_personality =
+1 -1
drivers/md/raid5.h
··· 668 668 struct llist_head released_stripes; 669 669 wait_queue_head_t wait_for_quiescent; 670 670 wait_queue_head_t wait_for_stripe; 671 - wait_queue_head_t wait_for_overlap; 671 + wait_queue_head_t wait_for_reshape; 672 672 unsigned long cache_state; 673 673 struct shrinker *shrinker; 674 674 int pool_size; /* number of disks in stripeheads in pool */