Page MenuHomeFreeBSD
Files F143175443

D9562.id.diff
No OneTemporary
Actions

D9562.id.diff
View Options

Index: head/sys/boot/efi/libefi/efipart.c
===================================================================
--- head/sys/boot/efi/libefi/efipart.c
+++ head/sys/boot/efi/libefi/efipart.c
@@ -254,7 +254,7 @@
}
unit++;
}
-
+
cd = malloc(sizeof(pdinfo_t));
if (cd == NULL) {
printf("Failed to add cd %d, out of memory\n", unit);
@@ -290,7 +290,7 @@
continue;
if (efipart_floppy(node) != NULL)
continue;
-
+
status = BS->HandleProtocol(efipart_handles[i],
&blkio_guid, (void **)&blkio);
if (EFI_ERROR(status))
@@ -589,14 +589,14 @@
if (STAILQ_EMPTY(pdlist))
return (0);
-
+
printf("%s devices:", dev->dv_name);
if ((ret = pager_output("\n")) != 0)
return (ret);
STAILQ_FOREACH(pd, pdlist, pd_link) {
h = pd->pd_handle;
- if (verbose) { /* Output the device path. */
+ if (verbose) { /* Output the device path. */
text = efi_devpath_name(efi_lookup_devpath(h));
if (text != NULL) {
printf(" %S", text);
@@ -707,7 +707,7 @@
pd = efiblk_get_pdinfo(pdi, dev->d_unit);
if (pd == NULL)
return (EIO);
-
+
if (pd->pd_blkio == NULL) {
status = BS->HandleProtocol(pd->pd_handle, &blkio_guid,
(void **)&pd->pd_blkio);
@@ -791,7 +791,7 @@
*(u_int *)data = pd->pd_blkio->Media->BlockSize;
break;
case DIOCGMEDIASIZE:
- *(off_t *)data = pd->pd_blkio->Media->BlockSize *
+ *(uint64_t *)data = pd->pd_blkio->Media->BlockSize *
(pd->pd_blkio->Media->LastBlock + 1);
break;
default:
@@ -915,9 +915,9 @@
if (rsize != NULL)
*rsize = size;
- if ((size % blkio->Media->BlockSize == 0) &&
+ if ((size % blkio->Media->BlockSize == 0) &&
((blk * 512) % blkio->Media->BlockSize == 0))
- return (efipart_readwrite(blkio, rw,
+ return (efipart_readwrite(blkio, rw,
blk * 512 / blkio->Media->BlockSize,
size / blkio->Media->BlockSize, buf));

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 27, 11:35 PM (13 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28061239
Default Alt Text
D9562.id.diff (1 KB)

Event Timeline