Imported Upstream version 0.6.5.3

[mirror_zfs-debian.git] / lib / libefi / rdwr_efi.c

diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c
index f4cf41712a69a456da23eb2b00659a7eeb6695dd..785cfe63b2962bd1b53f34c8fe4f121ccd154a5f 100644 (file)
--- a/lib/libefi/rdwr_efi.c
+++ b/lib/libefi/rdwr_efi.c
@@ -87,7 +87,8 @@ struct dk_map2  default_vtoc_map[NDKMAP] = {
 
 #if defined(_SUNOS_VTOC_16)
 
-#if defined(i386) || defined(__amd64) || defined(__arm) || defined(__powerpc)
+#if defined(i386) || defined(__amd64) || defined(__arm) || \
+    defined(__powerpc) || defined(__sparc)
        {       V_BOOT,         V_UNMNT },              /* i - 8 */
        {       V_ALTSCTR,      0       },              /* j - 9 */
 
@@ -132,8 +133,8 @@ read_disk_info(int fd, diskaddr_t *capacity, uint_t *lbsize)
        int sector_size;
        unsigned long long capacity_size;
 
-        if (ioctl(fd, BLKSSZGET, &sector_size) < 0)
-                return (-1);
+       if (ioctl(fd, BLKSSZGET, &sector_size) < 0)
+               return (-1);
 
        if (ioctl(fd, BLKGETSIZE64, &capacity_size) < 0)
                return (-1);
@@ -152,7 +153,7 @@ efi_get_info(int fd, struct dk_cinfo *dki_info)
        char *dev_path;
        int rval = 0;
 
-       memset(dki_info, 0, sizeof(*dki_info));
+       memset(dki_info, 0, sizeof (*dki_info));
 
        path = calloc(PATH_MAX, 1);
        if (path == NULL)
@@ -182,44 +183,60 @@ efi_get_info(int fd, struct dk_cinfo *dki_info)
                strcpy(dki_info->dki_cname, "sd");
                dki_info->dki_ctype = DKC_SCSI_CCS;
                rval = sscanf(dev_path, "/dev/%[a-zA-Z]%hu",
-                             dki_info->dki_dname,
-                             &dki_info->dki_partition);
+                   dki_info->dki_dname,
+                   &dki_info->dki_partition);
        } else if ((strncmp(dev_path, "/dev/hd", 7) == 0)) {
                strcpy(dki_info->dki_cname, "hd");
                dki_info->dki_ctype = DKC_DIRECT;
                rval = sscanf(dev_path, "/dev/%[a-zA-Z]%hu",
-                             dki_info->dki_dname,
-                             &dki_info->dki_partition);
+                   dki_info->dki_dname,
+                   &dki_info->dki_partition);
        } else if ((strncmp(dev_path, "/dev/md", 7) == 0)) {
                strcpy(dki_info->dki_cname, "pseudo");
                dki_info->dki_ctype = DKC_MD;
-               rval = sscanf(dev_path, "/dev/%[a-zA-Z0-9]p%hu",
-                             dki_info->dki_dname,
-                             &dki_info->dki_partition);
+               strcpy(dki_info->dki_dname, "md");
+               rval = sscanf(dev_path, "/dev/md%[0-9]p%hu",
+                   dki_info->dki_dname + 2,
+                   &dki_info->dki_partition);
        } else if ((strncmp(dev_path, "/dev/vd", 7) == 0)) {
                strcpy(dki_info->dki_cname, "vd");
                dki_info->dki_ctype = DKC_MD;
                rval = sscanf(dev_path, "/dev/%[a-zA-Z]%hu",
-                             dki_info->dki_dname,
-                             &dki_info->dki_partition);
+                   dki_info->dki_dname,
+                   &dki_info->dki_partition);
+       } else if ((strncmp(dev_path, "/dev/xvd", 8) == 0)) {
+               strcpy(dki_info->dki_cname, "xvd");
+               dki_info->dki_ctype = DKC_MD;
+               rval = sscanf(dev_path, "/dev/%[a-zA-Z]%hu",
+                   dki_info->dki_dname,
+                   &dki_info->dki_partition);
+       } else if ((strncmp(dev_path, "/dev/zd", 7) == 0)) {
+               strcpy(dki_info->dki_cname, "zd");
+               dki_info->dki_ctype = DKC_MD;
+               rval = sscanf(dev_path, "/dev/%[a-zA-Z]%hu",
+                   dki_info->dki_dname,
+                   &dki_info->dki_partition);
        } else if ((strncmp(dev_path, "/dev/dm-", 8) == 0)) {
                strcpy(dki_info->dki_cname, "pseudo");
                dki_info->dki_ctype = DKC_VBD;
-               rval = sscanf(dev_path, "/dev/%[a-zA-Z0-9-]p%hu",
-                             dki_info->dki_dname,
-                             &dki_info->dki_partition);
+               strcpy(dki_info->dki_dname, "dm-");
+               rval = sscanf(dev_path, "/dev/dm-%[0-9]p%hu",
+                   dki_info->dki_dname + 3,
+                   &dki_info->dki_partition);
        } else if ((strncmp(dev_path, "/dev/ram", 8) == 0)) {
                strcpy(dki_info->dki_cname, "pseudo");
                dki_info->dki_ctype = DKC_PCMCIA_MEM;
-               rval = sscanf(dev_path, "/dev/%[a-zA-Z0-9]p%hu",
-                             dki_info->dki_dname,
-                             &dki_info->dki_partition);
+               strcpy(dki_info->dki_dname, "ram");
+               rval = sscanf(dev_path, "/dev/ram%[0-9]p%hu",
+                   dki_info->dki_dname + 3,
+                   &dki_info->dki_partition);
        } else if ((strncmp(dev_path, "/dev/loop", 9) == 0)) {
                strcpy(dki_info->dki_cname, "pseudo");
                dki_info->dki_ctype = DKC_VBD;
-               rval = sscanf(dev_path, "/dev/%[a-zA-Z0-9]p%hu",
-                             dki_info->dki_dname,
-                             &dki_info->dki_partition);
+               strcpy(dki_info->dki_dname, "loop");
+               rval = sscanf(dev_path, "/dev/loop%[0-9]p%hu",
+                   dki_info->dki_dname + 4,
+                   &dki_info->dki_partition);
        } else {
                strcpy(dki_info->dki_dname, "unknown");
                strcpy(dki_info->dki_cname, "unknown");
@@ -395,10 +412,10 @@ efi_ioctl(int fd, int cmd, dk_efi_t *dk_ioc)
         */
        if (read_disk_info(fd, &capacity, &lbsize) == -1) {
                if (efi_debug)
-                       fprintf(stderr,"unable to read disk info: %d",errno);
+                       fprintf(stderr, "unable to read disk info: %d", errno);
 
                errno = EIO;
-               return -1;
+               return (-1);
        }
 
        switch (cmd) {
@@ -406,7 +423,7 @@ efi_ioctl(int fd, int cmd, dk_efi_t *dk_ioc)
                if (lbsize == 0) {
                        if (efi_debug)
                                (void) fprintf(stderr, "DKIOCGETEFI assuming "
-                                              "LBA %d bytes\n", DEV_BSIZE);
+                                   "LBA %d bytes\n", DEV_BSIZE);
 
                        lbsize = DEV_BSIZE;
                }
@@ -415,24 +432,24 @@ efi_ioctl(int fd, int cmd, dk_efi_t *dk_ioc)
                if (error == -1) {
                        if (efi_debug)
                                (void) fprintf(stderr, "DKIOCGETEFI lseek "
-                                              "error: %d\n", errno);
-                       return error;
+                                   "error: %d\n", errno);
+                       return (error);
                }
 
                error = read(fd, data, dk_ioc->dki_length);
                if (error == -1) {
                        if (efi_debug)
                                (void) fprintf(stderr, "DKIOCGETEFI read "
-                                              "error: %d\n", errno);
-                       return error;
+                                   "error: %d\n", errno);
+                       return (error);
                }
 
                if (error != dk_ioc->dki_length) {
                        if (efi_debug)
                                (void) fprintf(stderr, "DKIOCGETEFI short "
-                                              "read of %d bytes\n", error);
+                                   "read of %d bytes\n", error);
                        errno = EIO;
-                       return -1;
+                       return (-1);
                }
                error = 0;
                break;
@@ -441,43 +458,43 @@ efi_ioctl(int fd, int cmd, dk_efi_t *dk_ioc)
                if (lbsize == 0) {
                        if (efi_debug)
                                (void) fprintf(stderr, "DKIOCSETEFI unknown "
-                                              "LBA size\n");
+                                   "LBA size\n");
                        errno = EIO;
-                       return -1;
+                       return (-1);
                }
 
                error = lseek(fd, dk_ioc->dki_lba * lbsize, SEEK_SET);
                if (error == -1) {
                        if (efi_debug)
                                (void) fprintf(stderr, "DKIOCSETEFI lseek "
-                                              "error: %d\n", errno);
-                       return error;
+                                   "error: %d\n", errno);
+                       return (error);
                }
 
                error = write(fd, data, dk_ioc->dki_length);
                if (error == -1) {
                        if (efi_debug)
                                (void) fprintf(stderr, "DKIOCSETEFI write "
-                                              "error: %d\n", errno);
-                       return error;
+                                   "error: %d\n", errno);
+                       return (error);
                }
 
                if (error != dk_ioc->dki_length) {
                        if (efi_debug)
                                (void) fprintf(stderr, "DKIOCSETEFI short "
-                                              "write of %d bytes\n", error);
+                                   "write of %d bytes\n", error);
                        errno = EIO;
-                       return -1;
+                       return (-1);
                }
 
                /* Sync the new EFI table to disk */
                error = fsync(fd);
                if (error == -1)
-                       return error;
+                       return (error);
 
                /* Ensure any local disk cache is also flushed */
                if (ioctl(fd, BLKFLSBUF, 0) == -1)
-                       return error;
+                       return (error);
 
                error = 0;
                break;
@@ -487,7 +504,7 @@ efi_ioctl(int fd, int cmd, dk_efi_t *dk_ioc)
                        (void) fprintf(stderr, "unsupported ioctl()\n");
 
                errno = EIO;
-               return -1;
+               return (-1);
        }
 #else
        dk_ioc->dki_data_64 = (uint64_t)(uintptr_t)data;
@@ -497,19 +514,21 @@ efi_ioctl(int fd, int cmd, dk_efi_t *dk_ioc)
        return (error);
 }
 
-int efi_rescan(int fd)
+int
+efi_rescan(int fd)
 {
 #if defined(__linux__)
-       int retry = 5;
+       int retry = 10;
        int error;
 
        /* Notify the kernel a devices partition table has been updated */
        while ((error = ioctl(fd, BLKRRPART)) != 0) {
-               if (--retry == 0) {
+               if ((--retry == 0) || (errno != EBUSY)) {
                        (void) fprintf(stderr, "the kernel failed to rescan "
-                                      "the partition table: %d\n", errno);
+                           "the partition table: %d\n", errno);
                        return (-1);
                }
+               usleep(50000);
        }
 #endif
 
@@ -548,7 +567,7 @@ check_label(int fd, dk_efi_t *dk_ioc)
        efi->efi_gpt_HeaderCRC32 = 0;
        len_t headerSize = (len_t)LE_32(efi->efi_gpt_HeaderSize);
 
-       if(headerSize < EFI_MIN_LABEL_SIZE || headerSize > EFI_LABEL_SIZE) {
+       if (headerSize < EFI_MIN_LABEL_SIZE || headerSize > EFI_LABEL_SIZE) {
                if (efi_debug)
                        (void) fprintf(stderr,
                                "Invalid EFI HeaderSize %llu.  Assuming %d.\n",
@@ -590,7 +609,7 @@ efi_read(int fd, struct dk_gpt *vtoc)
         * get the partition number for this file descriptor.
         */
        if ((rval = efi_get_info(fd, &dki_info)) != 0)
-               return rval;
+               return (rval);
 
        if ((strncmp(dki_info.dki_cname, "pseudo", 7) == 0) &&
            (strncmp(dki_info.dki_dname, "md", 3) == 0)) {
@@ -608,8 +627,8 @@ efi_read(int fd, struct dk_gpt *vtoc)
        if (read_disk_info(fd, &capacity, &lbsize) == -1) {
                if (efi_debug) {
                        (void) fprintf(stderr,
-                                      "unable to read disk info: %d",
-                                      errno);
+                           "unable to read disk info: %d",
+                           errno);
                }
                return (VT_EINVAL);
        }
@@ -642,7 +661,7 @@ efi_read(int fd, struct dk_gpt *vtoc)
        }
 
        if (posix_memalign((void **)&dk_ioc.dki_data,
-                          disk_info.dki_lbsize, label_len))
+           disk_info.dki_lbsize, label_len))
                return (VT_ERROR);
 
        memset(dk_ioc.dki_data, 0, label_len);
@@ -854,11 +873,11 @@ write_pmbr(int fd, struct dk_gpt *vtoc)
        /* LINTED -- always longlong aligned */
        dk_ioc.dki_data = (efi_gpt_t *)buf;
        if (efi_ioctl(fd, DKIOCGETEFI, &dk_ioc) == -1) {
-               (void *) memcpy(&mb, buf, sizeof (mb));
+               (void) memcpy(&mb, buf, sizeof (mb));
                bzero(&mb, sizeof (mb));
                mb.signature = LE_16(MBB_MAGIC);
        } else {
-               (void *) memcpy(&mb, buf, sizeof (mb));
+               (void) memcpy(&mb, buf, sizeof (mb));
                if (mb.signature != LE_16(MBB_MAGIC)) {
                        bzero(&mb, sizeof (mb));
                        mb.signature = LE_16(MBB_MAGIC);
@@ -898,7 +917,7 @@ write_pmbr(int fd, struct dk_gpt *vtoc)
                *cp++ = 0xff;
        }
 
-       (void *) memcpy(buf, &mb, sizeof (mb));
+       (void) memcpy(buf, &mb, sizeof (mb));
        /* LINTED -- always longlong aligned */
        dk_ioc.dki_data = (efi_gpt_t *)buf;
        dk_ioc.dki_lba = 0;
@@ -1117,7 +1136,7 @@ efi_write(int fd, struct dk_gpt *vtoc)
        diskaddr_t              lba_backup_gpt_hdr;
 
        if ((rval = efi_get_info(fd, &dki_info)) != 0)
-               return rval;
+               return (rval);
 
        /* check if we are dealing wih a metadevice */
        if ((strncmp(dki_info.dki_cname, "pseudo", 7) == 0) &&
@@ -1156,7 +1175,7 @@ efi_write(int fd, struct dk_gpt *vtoc)
         */
        lba_backup_gpt_hdr = vtoc->efi_last_u_lba + 1 + nblocks;
        if (posix_memalign((void **)&dk_ioc.dki_data,
-                          vtoc->efi_lbasize, dk_ioc.dki_length))
+           vtoc->efi_lbasize, dk_ioc.dki_length))
                return (VT_ERROR);
 
        memset(dk_ioc.dki_data, 0, dk_ioc.dki_length);