vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2010-08-01 Robert Millan <rmh@gnu.org>

Browse source 
Make it even harder to use uninitialized `libzfs_handle' (and
	make the interface a bit simpler).
	
	* include/grub/util/misc.h (grub_util_init_libzfs)
	(libzfs_handle): Remove.
	(grub_get_libzfs_handle): New prototype.
	
	* util/misc.c [HAVE_LIBZFS] (libzfs_handle): Add `static'
	attribute.
	(grub_util_init_libzfs): Remove.
	(grub_get_libzfs_handle): New function.
	
	* kern/emu/getroot.c (find_root_device_from_libzfs): Use
	grub_get_libzfs_handle() to obtain a libzfs handle instead of
	accessing `libzfs_handle' directly.
This commit is contained in:
Robert Millan 2010-08-01 23:12:24 +02:00
parent c882acc031
commit f7abdefbdd
4 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/grub/util/misc.h
View file

@ -61,7 +61,6 @@ char *canonicalize_file_name (const char *path);
void grub_util_init_nls (void);
void grub_util_init_libzfs (void);
extern libzfs_handle_t *libzfs_handle;
libzfs_handle_t *grub_get_libzfs_handle (void);
#endif /* ! GRUB_UTIL_MISC_HEADER */