You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.4 KiB
40 lines
1.4 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Thomas Falcon <tlfalcon@linux.vnet.ibm.com> |
|
Date: Mon, 31 Mar 2014 15:32:30 +0100 |
|
Subject: [PATCH] btrfs: fix get_root key comparison failures due to endianness |
|
|
|
* grub-core/fs/btrfs.c (get_root): Convert |
|
GRUB_BTRFS_ROOT_VOL_OBJECTID to little-endian. |
|
--- |
|
grub-core/fs/btrfs.c | 2 +- |
|
ChangeLog | 7 +++++++ |
|
2 files changed, 8 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c |
|
index 89666b6fd59..f7b6c152037 100644 |
|
--- a/grub-core/fs/btrfs.c |
|
+++ b/grub-core/fs/btrfs.c |
|
@@ -1201,7 +1201,7 @@ get_root (struct grub_btrfs_data *data, struct grub_btrfs_key *key, |
|
struct grub_btrfs_key key_out, key_in; |
|
struct grub_btrfs_root_item ri; |
|
|
|
- key_in.object_id = GRUB_BTRFS_ROOT_VOL_OBJECTID; |
|
+ key_in.object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_ROOT_VOL_OBJECTID); |
|
key_in.offset = 0; |
|
key_in.type = GRUB_BTRFS_ITEM_TYPE_ROOT_ITEM; |
|
err = lower_bound (data, &key_in, &key_out, |
|
diff --git a/ChangeLog b/ChangeLog |
|
index 1cb3b683fcf..accffade86b 100644 |
|
--- a/ChangeLog |
|
+++ b/ChangeLog |
|
@@ -1,3 +1,10 @@ |
|
+2014-03-31 Thomas Falcon <tlfalcon@linux.vnet.ibm.com> |
|
+ |
|
+ btrfs: fix get_root key comparison failures due to endianness |
|
+ |
|
+ * grub-core/fs/btrfs.c (get_root): Convert |
|
+ GRUB_BTRFS_ROOT_VOL_OBJECTID to little-endian. |
|
+ |
|
2014-03-31 Colin Watson <cjwatson@ubuntu.com> |
|
|
|
Fix partmap, cryptodisk, and abstraction handling in grub-mkconfig.
|
|
|