diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2019-09-17 16:55:46 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-09-17 16:55:46 +0200 |
commit | cd0060a616b965de788837d822ce0bc3a29b9ce3 (patch) | |
tree | b5f54289d131eec4df749a3fc8354ad89224b2bc /drivers/md/md.c | |
parent | 29a41bb38356b99a17b82a7652752b9f25959919 (diff) | |
parent | 6b774eec1f9d3064e9b33634dfa99d5666d0a73a (diff) |
Merge remote-tracking branch 'fslc/4.14-2.0.x-imx' into toradex_4.14-2.0.x-imx-next
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 5599712d478e..b27a69388dcd 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2845,8 +2845,10 @@ state_store(struct md_rdev *rdev, const char *buf, size_t len) err = 0; } } else if (cmd_match(buf, "re-add")) { - if (test_bit(Faulty, &rdev->flags) && (rdev->raid_disk == -1) && - rdev->saved_raid_disk >= 0) { + if (!rdev->mddev->pers) + err = -EINVAL; + else if (test_bit(Faulty, &rdev->flags) && (rdev->raid_disk == -1) && + rdev->saved_raid_disk >= 0) { /* clear_bit is performed _after_ all the devices * have their local Faulty bit cleared. If any writes * happen in the meantime in the local node, they |