mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 02:27:36 +03:00
OpenZFS restructuring - libspl
Factor Linux specific pieces out of libspl. Reviewed-by: Ryan Moeller <ryan@ixsystems.com> Reviewed-by: Sean Eric Fagan <sef@ixsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Matt Macy <mmacy@FreeBSD.org> Closes #9336
This commit is contained in:
committed by
Brian Behlendorf
parent
6360e2779e
commit
d31277abb1
@@ -34,10 +34,6 @@
|
||||
#include <time.h>
|
||||
#include <stdint.h>
|
||||
|
||||
typedef unsigned char uchar_t;
|
||||
typedef long long longlong_t;
|
||||
typedef longlong_t offset_t;
|
||||
|
||||
static unsigned char bigbuffer[BIGBUFFERSIZE];
|
||||
|
||||
/*
|
||||
|
||||
@@ -33,12 +33,9 @@
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stdtypes.h>
|
||||
#include <unistd.h>
|
||||
|
||||
typedef long long offset_t;
|
||||
#define MAXOFFSET_T LLONG_MAX
|
||||
|
||||
/*
|
||||
* --------------------------------------------------------------
|
||||
*
|
||||
|
||||
@@ -2,10 +2,6 @@ include $(top_srcdir)/config/Rules.am
|
||||
|
||||
pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin
|
||||
|
||||
DEFAULT_INCLUDES += \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/lib/libspl/include
|
||||
|
||||
pkgexec_PROGRAMS = libzfs_input_check
|
||||
|
||||
libzfs_input_check_SOURCES = libzfs_input_check.c
|
||||
|
||||
@@ -30,8 +30,6 @@
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
||||
typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
|
||||
|
||||
static void
|
||||
usage(char *progname)
|
||||
{
|
||||
|
||||
@@ -35,17 +35,13 @@
|
||||
#include <libintl.h>
|
||||
#include <errno.h>
|
||||
|
||||
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
||||
|
||||
#define BLOCK_SIZE 512 /* bytes */
|
||||
#define BLOCKSIZE 512 /* bytes */
|
||||
#define KILOBYTE 1024
|
||||
#define MEGABYTE (KILOBYTE * KILOBYTE)
|
||||
#define GIGABYTE (KILOBYTE * MEGABYTE)
|
||||
|
||||
#define FILE_MODE (S_ISVTX + S_IRUSR + S_IWUSR)
|
||||
|
||||
typedef long long offset_t;
|
||||
|
||||
static void usage(void);
|
||||
|
||||
int
|
||||
@@ -95,7 +91,7 @@ main(int argc, char **argv)
|
||||
break;
|
||||
case 'b':
|
||||
case 'B':
|
||||
mult = BLOCK_SIZE;
|
||||
mult = BLOCKSIZE;
|
||||
break;
|
||||
case 'm':
|
||||
case 'M':
|
||||
|
||||
@@ -2,10 +2,6 @@ include $(top_srcdir)/config/Rules.am
|
||||
|
||||
pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/bin
|
||||
|
||||
DEFAULT_INCLUDES += \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/lib/libspl/include
|
||||
|
||||
pkgexec_PROGRAMS = nvlist_to_lua
|
||||
|
||||
nvlist_to_lua_SOURCES = nvlist_to_lua.c
|
||||
|
||||
@@ -38,9 +38,7 @@
|
||||
#include <stdio.h>
|
||||
#include <sys/note.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
|
||||
typedef unsigned long long u_longlong_t;
|
||||
#include <sys/stdtypes.h>
|
||||
|
||||
/*
|
||||
* Test messages from:
|
||||
|
||||
@@ -39,9 +39,8 @@
|
||||
#include <sys/time.h>
|
||||
#define _SHA2_IMPL
|
||||
#include <sys/sha2.h>
|
||||
#include <sys/stdtypes.h>
|
||||
#define NOTE(x)
|
||||
typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
|
||||
typedef unsigned long long u_longlong_t;
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -37,11 +37,9 @@
|
||||
#include <strings.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/stdtypes.h>
|
||||
#define NOTE(x)
|
||||
|
||||
typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
|
||||
typedef unsigned long long u_longlong_t;
|
||||
|
||||
/*
|
||||
* Skein test suite using values from the Skein V1.3 specification found at:
|
||||
* http://www.skein-hash.info/sites/default/files/skein1.3.pdf
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
include $(top_srcdir)/config/Rules.am
|
||||
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/include
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/lib/libspl/include
|
||||
LDADD = $(top_builddir)/lib/libzpool/libzpool.la
|
||||
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
@@ -9,10 +9,6 @@ dist_pkgdata_SCRIPTS = \
|
||||
setup.ksh \
|
||||
libzfs_input.ksh
|
||||
|
||||
DEFAULT_INCLUDES += \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/lib/libspl/include
|
||||
|
||||
many_fds_LDADD = \
|
||||
$(top_builddir)/lib/libzfs/libzfs.la
|
||||
|
||||
|
||||
Reference in New Issue
Block a user