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-23 09:26:10 -08:00
parent c8515979d3 4230c743cd
commit 1376203419
6 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/zpios/Makefile.am
View File

@ -1,5 +1,11 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES += \
-I${top_srcdir}/module/zpios/include \
-I${top_srcdir}/module/zfs \
-I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include
sbin_PROGRAMS = zpios sbin_PROGRAMS = zpios
zpios_SOURCES = \ zpios_SOURCES = \

2
cmd/zpios/zpios.h
View File

@ -33,7 +33,7 @@
#ifndef _ZPIOS_H #ifndef _ZPIOS_H
#define _ZPIOS_H #define _ZPIOS_H
#include <kpios-ctl.h> #include <zpios-ctl.h>
#define VERSION_SIZE 64 #define VERSION_SIZE 64

2
module/zpios/include/Makefile.in
View File

@ -1 +1 @@
DISTFILES = kpios-ctl.h kpios-internal.h DISTFILES = zpios-ctl.h zpios-internal.h

0
module/zpios/include/kpios-ctl.h → module/zpios/include/zpios-ctl.h
View File

2
module/zpios/include/kpios-internal.h → module/zpios/include/zpios-internal.h
View File

@ -33,7 +33,7 @@
#ifndef _KPIOS_INTERNAL_H #ifndef _KPIOS_INTERNAL_H
#define _KPIOS_INTERNAL_H #define _KPIOS_INTERNAL_H
#include "kpios-ctl.h" #include "zpios-ctl.h"
#define OBJ_SIZE 64 #define OBJ_SIZE 64

2
module/zpios/kpios.c → module/zpios/zpios.c
View File

@ -37,7 +37,7 @@
#include <sys/dmu.h> #include <sys/dmu.h>
#include <sys/txg.h> #include <sys/txg.h>
#include <linux/cdev.h> #include <linux/cdev.h>
#include "kpios-internal.h" #include "zpios-internal.h"
static struct class *kpios_class; static struct class *kpios_class;