Illumos #3306, #3321

[zfs.git] / lib / libefi / rdwr_efi.c

diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c
index c317d24..f4cf417 100644 (file)
--- a/lib/libefi/rdwr_efi.c
+++ b/lib/libefi/rdwr_efi.c
@@ -87,7 +87,7 @@ struct dk_map2  default_vtoc_map[NDKMAP] = {
 
 #if defined(_SUNOS_VTOC_16)
 
-#if defined(i386) || defined(__amd64)
+#if defined(i386) || defined(__amd64) || defined(__arm) || defined(__powerpc)
        {       V_BOOT,         V_UNMNT },              /* i - 8 */
        {       V_ALTSCTR,      0       },              /* j - 9 */
 
@@ -497,10 +497,9 @@ efi_ioctl(int fd, int cmd, dk_efi_t *dk_ioc)
        return (error);
 }
 
-#if defined(__linux__)
-static int
-efi_rescan(int fd)
+int efi_rescan(int fd)
 {
+#if defined(__linux__)
        int retry = 5;
        int error;
 
@@ -512,10 +511,10 @@ efi_rescan(int fd)
                        return (-1);
                }
        }
+#endif
 
        return (0);
 }
-#endif
 
 static int
 check_label(int fd, dk_efi_t *dk_ioc)
@@ -1028,24 +1027,15 @@ efi_use_whole_disk(int fd)
        struct dk_gpt           *efi_label;
        int                     rval;
        int                     i;
-       uint_t                  phy_last_slice = 0;
-       diskaddr_t              pl_start = 0;
-       diskaddr_t              pl_size;
+       uint_t                  resv_index = 0, data_index = 0;
+       diskaddr_t              resv_start = 0, data_start = 0;
+       diskaddr_t              difference;
 
        rval = efi_alloc_and_read(fd, &efi_label);
        if (rval < 0) {
                return (rval);
        }
 
-       /* find the last physically non-zero partition */
-       for (i = 0; i < efi_label->efi_nparts - 2; i ++) {
-               if (pl_start < efi_label->efi_parts[i].p_start) {
-                       pl_start = efi_label->efi_parts[i].p_start;
-                       phy_last_slice = i;
-               }
-       }
-       pl_size = efi_label->efi_parts[phy_last_slice].p_size;
-
        /*
         * If alter_lba is 1, we are using the backup label.
         * Since we can locate the backup label by disk capacity,
@@ -1061,16 +1051,28 @@ efi_use_whole_disk(int fd)
                return (VT_ENOSPC);
        }
 
+       difference = efi_label->efi_last_lba - efi_label->efi_altern_lba;
+
        /*
-        * If there is space between the last physically non-zero partition
-        * and the reserved partition, just add the unallocated space to this
-        * area. Otherwise, the unallocated space is added to the last
-        * physically non-zero partition.
+        * Find the last physically non-zero partition.
+        * This is the reserved partition.
         */
-       if (pl_start + pl_size - 1 == efi_label->efi_last_u_lba -
-           EFI_MIN_RESV_SIZE) {
-               efi_label->efi_parts[phy_last_slice].p_size +=
-                   efi_label->efi_last_lba - efi_label->efi_altern_lba;
+       for (i = 0; i < efi_label->efi_nparts; i ++) {
+               if (resv_start < efi_label->efi_parts[i].p_start) {
+                       resv_start = efi_label->efi_parts[i].p_start;
+                       resv_index = i;
+               }
+       }
+
+       /*
+        * Find the last physically non-zero partition before that.
+        * This is the data partition.
+        */
+       for (i = 0; i < resv_index; i ++) {
+               if (data_start < efi_label->efi_parts[i].p_start) {
+                       data_start = efi_label->efi_parts[i].p_start;
+                       data_index = i;
+               }
        }
 
        /*
@@ -1078,10 +1080,9 @@ efi_use_whole_disk(int fd)
         * here except fabricated devids (which get generated via
         * efi_write()). So there is no need to copy data.
         */
-       efi_label->efi_parts[efi_label->efi_nparts - 1].p_start +=
-           efi_label->efi_last_lba - efi_label->efi_altern_lba;
-       efi_label->efi_last_u_lba += efi_label->efi_last_lba
-           - efi_label->efi_altern_lba;
+       efi_label->efi_parts[data_index].p_size += difference;
+       efi_label->efi_parts[resv_index].p_start += difference;
+       efi_label->efi_last_u_lba += difference;
 
        rval = efi_write(fd, efi_label);
        if (rval < 0) {
@@ -1302,12 +1303,6 @@ efi_write(int fd, struct dk_gpt *vtoc)
        (void) write_pmbr(fd, vtoc);
        free(dk_ioc.dki_data);
 
-#if defined(__linux__)
-       rval = efi_rescan(fd);
-       if (rval)
-               return (VT_ERROR);
-#endif
-
        return (0);
 }