git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minimize ztest stack frame size
[zfs.git]
/
lib
/
libefi
/
rdwr_efi.c
diff --git
a/lib/libefi/rdwr_efi.c
b/lib/libefi/rdwr_efi.c
index
474f78a
..
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(_SUNOS_VTOC_16)
-#if defined(i386) || defined(__amd64) || defined(__arm)
+#if defined(i386) || defined(__amd64) || defined(__arm)
|| defined(__powerpc)
{ V_BOOT, V_UNMNT }, /* i - 8 */
{ V_ALTSCTR, 0 }, /* j - 9 */
{ 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);
}
return (error);
}
-#if defined(__linux__)
-static int
-efi_rescan(int fd)
+int efi_rescan(int fd)
{
{
+#if defined(__linux__)
int retry = 5;
int error;
int retry = 5;
int error;
@@
-512,10
+511,10
@@
efi_rescan(int fd)
return (-1);
}
}
return (-1);
}
}
+#endif
return (0);
}
return (0);
}
-#endif
static int
check_label(int fd, dk_efi_t *dk_ioc)
static int
check_label(int fd, dk_efi_t *dk_ioc)
@@
-1304,12
+1303,6
@@
efi_write(int fd, struct dk_gpt *vtoc)
(void) write_pmbr(fd, vtoc);
free(dk_ioc.dki_data);
(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);
}
return (0);
}