[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/15] ofdisk: refactor open logic
From: |
Eric Snowberg |
Subject: |
[PATCH 10/15] ofdisk: refactor open logic |
Date: |
Wed, 29 Jun 2016 14:43:23 -0700 |
Consolidate duplicate code into grub_ofdisk_new_open. This is in preperation
for further last_ihandle changes for disk open caching on SPARC.
Signed-off-by: Eric Snowberg <address@hidden>
---
grub-core/disk/ieee1275/ofdisk.c | 47 +++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
index 6eaa044..6789072 100644
--- a/grub-core/disk/ieee1275/ofdisk.c
+++ b/grub-core/disk/ieee1275/ofdisk.c
@@ -48,6 +48,9 @@ static grub_err_t
grub_ofdisk_get_block_size (grub_uint32_t *block_size,
struct ofdisk_hash_ent *op);
+static grub_err_t
+grub_ofdisk_open_real (grub_disk_t disk);
+
#define OFDISK_HASH_SZ 8
static struct ofdisk_hash_ent *ofdisk_hash[OFDISK_HASH_SZ];
@@ -504,16 +507,12 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
}
disk->id = (unsigned long) op;
disk->data = op->open_path;
-
- if (last_ihandle)
- grub_ieee1275_close (last_ihandle);
-
- last_ihandle = 0;
- last_devpath = NULL;
-
- grub_ieee1275_open (devpath, &last_ihandle);
- if (! last_ihandle)
- return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
+ err = grub_ofdisk_open_real (disk);
+ if (err)
+ {
+ grub_free (devpath);
+ return err;
+ }
err = grub_ofdisk_get_block_size (&block_size, op);
if (err)
@@ -553,17 +552,13 @@ grub_ofdisk_prepare (grub_disk_t disk, grub_disk_addr_t
sector)
{
grub_ssize_t status;
unsigned long long pos;
+ grub_err_t err;
if (disk->data != last_devpath)
{
- if (last_ihandle)
- grub_ieee1275_close (last_ihandle);
- last_ihandle = 0;
- last_devpath = NULL;
-
- grub_ieee1275_open (disk->data, &last_ihandle);
- if (! last_ihandle)
- return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
+ err = grub_ofdisk_open_real (disk);
+ if (err)
+ return err;
last_devpath = disk->data;
}
@@ -734,3 +729,19 @@ grub_ofdisk_get_block_size (grub_uint32_t *block_size,
struct ofdisk_hash_ent *o
return 0;
}
+
+static grub_err_t
+grub_ofdisk_open_real (grub_disk_t disk)
+{
+ if (last_ihandle)
+ grub_ieee1275_close (last_ihandle);
+
+ last_ihandle = 0;
+ last_devpath = NULL;
+
+ grub_ieee1275_open (disk->data, &last_ihandle);
+ if (! last_ihandle)
+ return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
+
+ return 0;
+}
--
1.7.1
- [PATCH 01/15] sparc64: fix OF path names for sun4v systems, (continued)
- [PATCH 01/15] sparc64: fix OF path names for sun4v systems, Eric Snowberg, 2016/06/29
- [PATCH 02/15] sparc64: Add blocklist GPT support for SPARC, Eric Snowberg, 2016/06/29
- [PATCH 03/15] grub-install: fix memory leak, Eric Snowberg, 2016/06/29
- [PATCH 04/15] sparc64: Use the correct disk name in core.img, Eric Snowberg, 2016/06/29
- [PATCH 05/15] ieee1275: fix segfault in grub-ofpathname, Eric Snowberg, 2016/06/29
- [PATCH 06/15] ieee1275: add nvme support within ofpath, Eric Snowberg, 2016/06/29
- [PATCH 07/15] ofdisk: memory corruption fix, Eric Snowberg, 2016/06/29
- [PATCH 09/15] ieee1275: ofdisk - don't continue to query block-size after we have it, Eric Snowberg, 2016/06/29
- [PATCH 08/15] ofdisk: move open logic, Eric Snowberg, 2016/06/29
- [PATCH 11/15] sparc64: boot performance improvements, Eric Snowberg, 2016/06/29
- [PATCH 10/15] ofdisk: refactor open logic,
Eric Snowberg <=
- [PATCH 12/15] ofdisk: only add aliases that exist, Eric Snowberg, 2016/06/29
- [PATCH 14/15] parser: Remove escape from the state transitions, Eric Snowberg, 2016/06/29
- [PATCH 13/15] sparc64: add disks that don't have a devalias to the device list, Eric Snowberg, 2016/06/29
- [PATCH 15/15] sparc64: ignore hypervisor reboot memory block device, Eric Snowberg, 2016/06/29