| @@ -4179,7 +4179,7 @@ array_state_show(struct mddev *mddev, char *page) · 4178 unmodified lines |
| 4179 | 4179 | { |
| 4180 | 4180 | enum array_state st = inactive; |
| 4181 | 4181 | |
| 4182 | | − if (mddev->pers) |
| 4182 | + if (mddev->pers && !test_bit(MD_NOT_READY, &mddev->flags)) |
| 4183 | 4183 | switch(mddev->ro) { |
| 4184 | 4184 | case 1: |
| 4185 | 4185 | st = readonly; |
| @@ -5776,9 +5776,6 @@ int md_run(struct mddev *mddev) · 1590 unmodified lines |
| 5776 | 5776 | md_update_sb(mddev, 0); |
| 5777 | 5777 | |
| 5778 | 5778 | md_new_event(mddev); |
| 5779 | | − sysfs_notify_dirent_safe(mddev->sysfs_state); |
| 5780 | | − sysfs_notify_dirent_safe(mddev->sysfs_action); |
| 5781 | | − sysfs_notify(&mddev->kobj, NULL, "degraded"); |
| 5782 | 5779 | return 0; |
| 5783 | 5780 | |
| 5784 | 5781 | bitmap_abort: |
| @@ -5799,6 +5796,7 @@ static int do_md_run(struct mddev *mddev) · 14 unmodified lines |
| 5799 | 5796 | { |
| 5800 | 5797 | int err; |
| 5801 | 5798 | |
| 5799 | + set_bit(MD_NOT_READY, &mddev->flags); |
| 5802 | 5800 | err = md_run(mddev); |
| 5803 | 5801 | if (err) |
| 5804 | 5802 | goto out; |
| @@ -5819,9 +5817,14 @@ static int do_md_run(struct mddev *mddev) · 14 unmodified lines |
| 5819 | 5817 | |
| 5820 | 5818 | set_capacity(mddev->gendisk, mddev->array_sectors); |
| 5821 | 5819 | revalidate_disk(mddev->gendisk); |
| 5820 | + clear_bit(MD_NOT_READY, &mddev->flags); |
| 5822 | 5821 | mddev->changed = 1; |
| 5823 | 5822 | kobject_uevent(&disk_to_dev(mddev->gendisk)->kobj, KOBJ_CHANGE); |
| 5823 | + sysfs_notify_dirent_safe(mddev->sysfs_state); |
| 5824 | + sysfs_notify_dirent_safe(mddev->sysfs_action); |
| 5825 | + sysfs_notify(&mddev->kobj, NULL, "degraded"); |
| 5824 | 5826 | out: |
| 5827 | + clear_bit(MD_NOT_READY, &mddev->flags); |
| 5825 | 5828 | return err; |
| 5826 | 5829 | } |
| 5827 | 5830 | |
| @@ -8932,6 +8935,7 @@ void md_check_recovery(struct mddev *mddev) · 3104 unmodified lines |
| 8932 | 8935 | |
| 8933 | 8936 | if (mddev_trylock(mddev)) { |
| 8934 | 8937 | int spares = 0; |
| 8938 | + bool try_set_sync = mddev->safemode != 0; |
| 8935 | 8939 | |
| 8936 | 8940 | if (!mddev->external && mddev->safemode == 1) |
| 8937 | 8941 | mddev->safemode = 0; |
| @@ -8977,7 +8981,7 @@ void md_check_recovery(struct mddev *mddev) · 39 unmodified lines |
| 8977 | 8981 | } |
| 8978 | 8982 | } |
| 8979 | 8983 | |
| 8980 | | − if (!mddev->external && !mddev->in_sync) { |
| 8984 | + if (try_set_sync && !mddev->external && !mddev->in_sync) { |
| 8981 | 8985 | spin_lock(&mddev->lock); |
| 8982 | 8986 | set_in_sync(mddev); |
| 8983 | 8987 | spin_unlock(&mddev->lock); |