Merge tag 'block-5.9-2020-08-14' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / drivers / md / md.c

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 15bbdc1630ed5f2abfe854b71bacedeab0e4a522..60727820702300139654292f0eee7e23db9038d4 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -850,7 +850,13 @@ void mddev_unlock(struct mddev *mddev)
                                sysfs_remove_group(&mddev->kobj, &md_redundancy_group);
                                if (mddev->sysfs_action)
                                        sysfs_put(mddev->sysfs_action);
+                               if (mddev->sysfs_completed)
+                                       sysfs_put(mddev->sysfs_completed);
+                               if (mddev->sysfs_degraded)
+                                       sysfs_put(mddev->sysfs_degraded);
                                mddev->sysfs_action = NULL;
+                               mddev->sysfs_completed = NULL;
+                               mddev->sysfs_degraded = NULL;
                        }
                }
                mddev->sysfs_active = 0;
@@ -4068,6 +4074,8 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
                        pr_warn("md: cannot register extra attributes for %s\n",
                                mdname(mddev));
                mddev->sysfs_action = sysfs_get_dirent(mddev->kobj.sd, "sync_action");
+               mddev->sysfs_completed = sysfs_get_dirent_safe(mddev->kobj.sd, "sync_completed");
+               mddev->sysfs_degraded = sysfs_get_dirent_safe(mddev->kobj.sd, "degraded");
        }
        if (oldpers->sync_request != NULL &&
            pers->sync_request == NULL) {
@@ -5582,14 +5590,9 @@ static void md_free(struct kobject *ko)
 
        if (mddev->sysfs_state)
                sysfs_put(mddev->sysfs_state);
-       if (mddev->sysfs_completed)
-               sysfs_put(mddev->sysfs_completed);
-       if (mddev->sysfs_degraded)
-               sysfs_put(mddev->sysfs_degraded);
        if (mddev->sysfs_level)
                sysfs_put(mddev->sysfs_level);
 
-
        if (mddev->gendisk)
                del_gendisk(mddev->gendisk);
        if (mddev->queue)
@@ -5757,8 +5760,6 @@ static int md_alloc(dev_t dev, char *name)
        if (!error && mddev->kobj.sd) {
                kobject_uevent(&mddev->kobj, KOBJ_ADD);
                mddev->sysfs_state = sysfs_get_dirent_safe(mddev->kobj.sd, "array_state");
-               mddev->sysfs_completed = sysfs_get_dirent_safe(mddev->kobj.sd, "sync_completed");
-               mddev->sysfs_degraded = sysfs_get_dirent_safe(mddev->kobj.sd, "degraded");
                mddev->sysfs_level = sysfs_get_dirent_safe(mddev->kobj.sd, "level");
        }
        mddev_put(mddev);
@@ -6036,6 +6037,8 @@ int md_run(struct mddev *mddev)
                        pr_warn("md: cannot register extra attributes for %s\n",
                                mdname(mddev));
                mddev->sysfs_action = sysfs_get_dirent_safe(mddev->kobj.sd, "sync_action");
+               mddev->sysfs_completed = sysfs_get_dirent_safe(mddev->kobj.sd, "sync_completed");
+               mddev->sysfs_degraded = sysfs_get_dirent_safe(mddev->kobj.sd, "degraded");
        } else if (mddev->ro == 2) /* auto-readonly not meaningful */
                mddev->ro = 0;