Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2008-12-16 15:34:51 -08:00
parent 6899898d40 7e43e16395
commit 1c42a85a37
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libzfs/libzfs_pool.c
View File

@ -310,6 +310,7 @@ bootfs_name_valid(const char *pool, char *bootfs)
static boolean_t static boolean_t
pool_uses_efi(nvlist_t *config) pool_uses_efi(nvlist_t *config)
{ {
#ifdef HAVE_LIBEFI
nvlist_t **child; nvlist_t **child;
uint_t c, children; uint_t c, children;
@ -321,6 +322,7 @@ pool_uses_efi(nvlist_t *config)
if (pool_uses_efi(child[c])) if (pool_uses_efi(child[c]))
return (B_TRUE); return (B_TRUE);
} }
#endif
return (B_FALSE); return (B_FALSE);
} }
@ -2780,6 +2782,7 @@ zpool_obj_to_path(zpool_handle_t *zhp, uint64_t dsobj, uint64_t obj,
*/ */
#define NEW_START_BLOCK 256 #define NEW_START_BLOCK 256
#ifdef HAVE_LIBEFI
/* /*
* Read the EFI label from the config, if a label does not exist then * Read the EFI label from the config, if a label does not exist then
* pass back the error to the caller. If the caller has passed a non-NULL * pass back the error to the caller. If the caller has passed a non-NULL
@ -2816,7 +2819,6 @@ read_efi_label(nvlist_t *config, diskaddr_t *sb)
* determine where a partition starts on a disk in the current * determine where a partition starts on a disk in the current
* configuration * configuration
*/ */
#ifdef HAVE_LIBEFI
static diskaddr_t static diskaddr_t
find_start_block(nvlist_t *config) find_start_block(nvlist_t *config)
{ {