|
 |
8c6b1ac |
From 12a9c52e516b94888db0a4502946242e3b14709f Mon Sep 17 00:00:00 2001
|
|
|
8c6b1ac |
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
8c6b1ac |
Date: Sat, 24 Jan 2015 20:57:26 +0100
|
|
|
8c6b1ac |
Subject: [PATCH 187/506] zfs: Fix disk-matching logic.
|
|
|
8c6b1ac |
|
|
|
8c6b1ac |
Reported by: Tim Chase <dweeezil>
|
|
|
8c6b1ac |
---
|
|
|
8c6b1ac |
grub-core/fs/zfs/zfs.c | 14 ++++++--------
|
|
|
8c6b1ac |
1 file changed, 6 insertions(+), 8 deletions(-)
|
|
|
8c6b1ac |
|
|
|
8c6b1ac |
diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
|
|
|
8c6b1ac |
index c943b52..c8c7b97 100644
|
|
|
8c6b1ac |
--- a/grub-core/fs/zfs/zfs.c
|
|
|
8c6b1ac |
+++ b/grub-core/fs/zfs/zfs.c
|
|
|
8c6b1ac |
@@ -252,7 +252,6 @@ struct grub_zfs_data
|
|
|
8c6b1ac |
|
|
|
8c6b1ac |
uberblock_t current_uberblock;
|
|
|
8c6b1ac |
|
|
|
8c6b1ac |
- int mounted;
|
|
|
8c6b1ac |
grub_uint64_t guid;
|
|
|
8c6b1ac |
};
|
|
|
8c6b1ac |
|
|
|
8c6b1ac |
@@ -957,7 +956,7 @@ nvpair_value (const char *nvp,char **val,
|
|
|
8c6b1ac |
static grub_err_t
|
|
|
8c6b1ac |
check_pool_label (struct grub_zfs_data *data,
|
|
|
8c6b1ac |
struct grub_zfs_device_desc *diskdesc,
|
|
|
8c6b1ac |
- int *inserted)
|
|
|
8c6b1ac |
+ int *inserted, int original)
|
|
|
8c6b1ac |
{
|
|
|
8c6b1ac |
grub_uint64_t pool_state, txg = 0;
|
|
|
8c6b1ac |
char *nvlist,*features;
|
|
|
8c6b1ac |
@@ -1081,11 +1080,12 @@ check_pool_label (struct grub_zfs_data *data,
|
|
|
8c6b1ac |
|
|
|
8c6b1ac |
grub_dprintf ("zfs", "check 11 passed\n");
|
|
|
8c6b1ac |
|
|
|
8c6b1ac |
- if (data->mounted && data->guid != poolguid)
|
|
|
8c6b1ac |
- return grub_error (GRUB_ERR_BAD_FS, "another zpool");
|
|
|
8c6b1ac |
- else
|
|
|
8c6b1ac |
+ if (original)
|
|
|
8c6b1ac |
data->guid = poolguid;
|
|
|
8c6b1ac |
|
|
|
8c6b1ac |
+ if (data->guid != poolguid)
|
|
|
8c6b1ac |
+ return grub_error (GRUB_ERR_BAD_FS, "another zpool");
|
|
|
8c6b1ac |
+
|
|
|
8c6b1ac |
{
|
|
|
8c6b1ac |
char *nv;
|
|
|
8c6b1ac |
nv = grub_zfs_nvlist_lookup_nvlist (nvlist, ZPOOL_CONFIG_VDEV_TREE);
|
|
|
8c6b1ac |
@@ -1186,7 +1186,7 @@ scan_disk (grub_device_t dev, struct grub_zfs_data *data,
|
|
|
8c6b1ac |
}
|
|
|
8c6b1ac |
grub_dprintf ("zfs", "label ok %d\n", label);
|
|
|
8c6b1ac |
|
|
|
8c6b1ac |
- err = check_pool_label (data, &desc, inserted);
|
|
|
8c6b1ac |
+ err = check_pool_label (data, &desc, inserted, original);
|
|
|
8c6b1ac |
if (err || !*inserted)
|
|
|
8c6b1ac |
{
|
|
|
8c6b1ac |
grub_errno = GRUB_ERR_NONE;
|
|
|
8c6b1ac |
@@ -3612,8 +3612,6 @@ zfs_mount (grub_device_t dev)
|
|
|
8c6b1ac |
ub_endian) >> 63) & 1;
|
|
|
8c6b1ac |
grub_free (osp);
|
|
|
8c6b1ac |
|
|
|
8c6b1ac |
- data->mounted = 1;
|
|
|
8c6b1ac |
-
|
|
|
8c6b1ac |
return data;
|
|
|
8c6b1ac |
}
|
|
|
8c6b1ac |
|
|
|
8c6b1ac |
--
|
|
|
8c6b1ac |
2.4.3
|
|
|
8c6b1ac |
|