Merge branch 'master' into devel-3.0

[thirdparty/mdadm.git] / Manage.c

diff --git a/Manage.c b/Manage.c
index 1f38fa54db91217af138eb528a448393eb26104a..65235bc1836f5e02c22c3e703cea2f39789b8023 100644 (file)
--- a/Manage.c
+++ b/Manage.c
@@ -588,6 +588,11 @@ int Manage_subdevs(char *devname, int fd,
                                                                fprintf(stderr, Name ": re-added %s\n", dv->devname);
                                                        continue;
                                                }
+                                               if (errno == ENOMEM || errno == EROFS) {
+                                                       fprintf(stderr, Name ": add new device failed for %s: %s\n",
+                                                               dv->devname, strerror(errno));
+                                                       return 1;
+                                               }
                                                /* fall back on normal-add */
                                        }
                                }