main: split scan_assemble into a separate function

[thirdparty/mdadm.git] / super-intel.c

diff --git a/super-intel.c b/super-intel.c
index e2ed95a15232ff1fe7e4947703ef6753450dbcce..07ab9aeddf1bc9f02b6ac282551a070538100329 100644 (file)
--- a/super-intel.c
+++ b/super-intel.c
@@ -9902,6 +9902,9 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
        struct imsm_dev *dev;
        struct intel_super *super;
        long long current_size;
+       unsigned long long free_size;
+       long long max_size;
+       int rv;
 
        getinfo_super_imsm_volume(st, &info, NULL);
        if ((geo->level != info.array.level) &&
@@ -10015,28 +10018,33 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
                                super->current_vol, st->devnum);
                        goto analyse_change_exit;
                }
+               /* check the maximum available size
+                */
+               rv =  imsm_get_free_size(st, dev->vol.map->num_members,
+                                        0, chunk, &free_size);
+               if (rv == 0)
+                       /* Cannot find maximum available space
+                        */
+                       max_size = 0;
+               else {
+                       max_size = free_size + current_size;
+                       /* align component size
+                        */
+                       max_size = imsm_component_size_aligment_check(
+                                       get_imsm_raid_level(dev->vol.map),
+                                       chunk * 1024,
+                                       max_size);
+               }
                if (geo->size == 0) {
                        /* requested size change to the maximum available size
                         */
-                       unsigned long long freesize;
-                       int rv;
-
-                       rv =  imsm_get_free_size(st, dev->vol.map->num_members,
-                                                0, chunk, &freesize);
-                       if (rv == 0) {
+                       if (max_size == 0) {
                                fprintf(stderr, Name " Error. Cannot find "
                                        "maximum available space.\n");
                                change = -1;
                                goto analyse_change_exit;
-                       }
-                       geo->size = freesize + current_size;
-
-                       /* align component size
-                        */
-                       geo->size = imsm_component_size_aligment_check(
-                                             get_imsm_raid_level(dev->vol.map),
-                                             chunk * 1024,
-                                             geo->size);
+                       } else
+                               geo->size = max_size;
                }
 
                if ((direction == ROLLBACK_METADATA_CHANGES)) {
@@ -10051,12 +10059,21 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
                                geo->size );
                        if (current_size >= geo->size) {
                                fprintf(stderr,
-                                       Name " Error. Size expanssion is "
+                                       Name " Error. Size expansion is "
                                        "supported only (current size is %llu, "
                                        "requested size /rounded/ is %llu).\n",
                                        current_size, geo->size);
                                goto analyse_change_exit;
                        }
+                       if (max_size && geo->size > max_size) {
+                               fprintf(stderr,
+                                       Name " Error. Requested size is larger "
+                                       "than maximum available size (maximum "
+                                       "available size is %llu, "
+                                       "requested size /rounded/ is %llu).\n",
+                                       max_size, geo->size);
+                               goto analyse_change_exit;
+                       }
                }
                geo->size *= data_disks;
                geo->raid_disks = dev->vol.map->num_members;
@@ -10353,8 +10370,10 @@ int check_degradation_change(struct mdinfo *info,
                             int degraded)
 {
        unsigned long long new_degraded;
-       sysfs_get_ll(info, NULL, "degraded", &new_degraded);
-       if (new_degraded != (unsigned long long)degraded) {
+       int rv;
+
+       rv = sysfs_get_ll(info, NULL, "degraded", &new_degraded);
+       if ((rv == -1) || (new_degraded != (unsigned long long)degraded)) {
                /* check each device to ensure it is still working */
                struct mdinfo *sd;
                new_degraded = 0;