df108aafe9
of args data between gptboot/zfsboot and loader(8). Despite what seems like a lot of changes here, there are no actual changes in behavior, or in the data layout in the structures involved. This is just eliminating identical code pasted into multiple locations. In detail, the changes are... - Move struct zfs_boot_args definition from libsa/zfs/libzfs.h to i386/common/bootargs.h because it is specific to x86 booting and the handoff between zfsboot and loader, and has no relation to the zfs library code in general. - The geli_boot_args and zfs_boot_args structs both contain an identical set of member variables containing geli information. Extract this out to a new geli_boot_data struct, and embed it in the arg-passing structs. - Provide new routines geli_import_boot_data() and geli_export_boot_data() that can be shared between gptboot, zfsboot, and loader instead of pasting identical code into several different .c files. - Remove some checks for a NULL pointer that can never be true because the pointer being tested was set using pointer math (kargs + 1) and that can never result in NULL in this code.
62 lines
2.1 KiB
C
62 lines
2.1 KiB
C
/*-
|
|
* Copyright (c) 2012 Andriy Gapon <avg@FreeBSD.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _BOOT_LIBZFS_H_
|
|
#define _BOOT_LIBZFS_H_
|
|
|
|
#define ZFS_MAXNAMELEN 256
|
|
|
|
/*
|
|
* ZFS fully-qualified device descriptor.
|
|
*/
|
|
struct zfs_devdesc {
|
|
struct devdesc dd; /* Must be first. */
|
|
uint64_t pool_guid;
|
|
uint64_t root_guid;
|
|
};
|
|
|
|
#ifdef LOADER_GELI_SUPPORT
|
|
#include <crypto/intake.h>
|
|
#endif
|
|
|
|
int zfs_parsedev(struct zfs_devdesc *dev, const char *devspec,
|
|
const char **path);
|
|
char *zfs_fmtdev(void *vdev);
|
|
int zfs_probe_dev(const char *devname, uint64_t *pool_guid);
|
|
int zfs_list(const char *name);
|
|
uint64_t ldi_get_size(void *);
|
|
void init_zfs_bootenv(const char *currdev);
|
|
int zfs_bootenv(const char *name);
|
|
int zfs_belist_add(const char *name, uint64_t __unused);
|
|
int zfs_set_env(void);
|
|
|
|
extern struct devsw zfs_dev;
|
|
extern struct fs_ops zfs_fsops;
|
|
|
|
#endif /*_BOOT_LIBZFS_H_*/
|