|
 |
1fcd613 |
From 755da11214d4695fbf8245d6d591ae633cadc791 Mon Sep 17 00:00:00 2001
|
|
|
1fcd613 |
From: Peter Jones <pjones@redhat.com>
|
|
|
1fcd613 |
Date: Wed, 2 Mar 2011 13:47:04 -0500
|
|
|
1fcd613 |
Subject: [PATCH] Get rid of unused variable in zfs.
|
|
|
1fcd613 |
|
|
|
1fcd613 |
---
|
|
|
624cc16 |
grub-core/mmap/efi/mmap.c | 3 +--
|
|
|
624cc16 |
grub-core/fs/zfs/zfs.c | 2 --
|
|
|
624cc16 |
2 files changed, 1 insertion(+), 4 deletions(-)
|
|
|
1fcd613 |
|
|
|
1fcd613 |
diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
|
|
|
1fcd613 |
index 5b575f3..3a94d88 100644
|
|
|
1fcd613 |
--- a/grub-core/fs/zfs/zfs.c
|
|
|
1fcd613 |
+++ b/grub-core/fs/zfs/zfs.c
|
|
|
1fcd613 |
@@ -837,14 +837,12 @@ zap_leaf_lookup (zap_leaf_phys_t * l, grub_zfs_endian_t endian,
|
|
|
1fcd613 |
name))
|
|
|
1fcd613 |
{
|
|
|
1fcd613 |
struct zap_leaf_array *la;
|
|
|
1fcd613 |
- grub_uint8_t *ip;
|
|
|
1fcd613 |
|
|
|
1fcd613 |
if (le->le_int_size != 8 || le->le_value_length != 1)
|
|
|
1fcd613 |
return grub_error (GRUB_ERR_BAD_FS, "invalid leaf chunk entry");
|
|
|
1fcd613 |
|
|
|
1fcd613 |
/* get the uint64_t property value */
|
|
|
1fcd613 |
la = &ZAP_LEAF_CHUNK (l, blksft, le->le_value_chunk).l_array;
|
|
|
1fcd613 |
- ip = la->la_array;
|
|
|
1fcd613 |
|
|
|
1fcd613 |
*value = grub_be_to_cpu64 (la->la_array64);
|
|
|
1fcd613 |
|
|
|
624cc16 |
diff --git a/grub-core/mmap/efi/mmap.c b/grub-core/mmap/efi/mmap.c
|
|
|
624cc16 |
index 5b82a87..8e5cce0 100644
|
|
|
624cc16 |
--- a/grub-core/mmap/efi/mmap.c
|
|
|
624cc16 |
+++ b/grub-core/mmap/efi/mmap.c
|
|
|
624cc16 |
@@ -194,7 +194,6 @@ grub_mmap_unregister (int handle)
|
|
|
624cc16 |
{
|
|
|
624cc16 |
struct overlay *curover, *prevover;
|
|
|
624cc16 |
grub_efi_boot_services_t *b;
|
|
|
624cc16 |
- grub_efi_status_t status;
|
|
|
624cc16 |
|
|
|
624cc16 |
b = grub_efi_system_table->boot_services;
|
|
|
624cc16 |
|
|
|
624cc16 |
@@ -204,7 +203,7 @@ grub_mmap_unregister (int handle)
|
|
|
624cc16 |
{
|
|
|
624cc16 |
if (curover->handle == handle)
|
|
|
624cc16 |
{
|
|
|
624cc16 |
- status = efi_call_2 (b->free_pages, curover->address, curover->pages);
|
|
|
624cc16 |
+ efi_call_2 (b->free_pages, curover->address, curover->pages);
|
|
|
624cc16 |
if (prevover != 0)
|
|
|
624cc16 |
prevover->next = curover->next;
|
|
|
624cc16 |
else
|
|
|
1fcd613 |
--
|
|
|
1fcd613 |
1.7.3.1
|
|
|
1fcd613 |
|