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

Merge commit 'refs/top-bases/top' into top

This commit is contained in:
Brian Behlendorf 2010-07-23 10:46:28 -07:00
parent 4339c82c4c f202496925
commit 017132e0c6
10 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ztest/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(FRAME_LARGER_THAN) AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libspl/include \

5
config/zfs-build.m4
View File

@ -18,15 +18,18 @@ AC_DEFUN([ZFS_AC_DEBUG], [
[ [
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror"
HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror" HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror"
DEBUG_CFLAGS="-DDEBUG -Werror -fstack-check" DEBUG_CFLAGS="-DDEBUG -Werror"
DEBUG_STACKFLAGS="-fstack-check"
], ],
[ [
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG " KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG " HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
DEBUG_CFLAGS="-DNDEBUG" DEBUG_CFLAGS="-DNDEBUG"
DEBUG_STACKFLAGS=""
]) ])
AC_SUBST(DEBUG_CFLAGS) AC_SUBST(DEBUG_CFLAGS)
AC_SUBST(DEBUG_STACKFLAGS)
AC_MSG_RESULT([$enable_debug]) AC_MSG_RESULT([$enable_debug])
]) ])

2
lib/libavl/Makefile.am
View File

@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/avl/include \ -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include

2
lib/libefi/Makefile.am
View File

@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libefi/include \ -I${top_srcdir}/lib/libefi/include \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include

14
lib/libefi/rdwr_efi.c
View File

@ -149,10 +149,16 @@ static int
efi_get_info(int fd, struct dk_cinfo *dki_info) efi_get_info(int fd, struct dk_cinfo *dki_info)
{ {
#if defined(__linux__) #if defined(__linux__)
char path[PATH_MAX]; char *path;
char *dev_path; char *dev_path;
int rval = 0; int rval = 0;
memset(dki_info, 0, sizeof(*dki_info));
path = calloc(PATH_MAX, 1);
if (path == NULL)
goto error;
/* /*
* The simplest way to get the partition number under linux is * The simplest way to get the partition number under linux is
* to parse it out of the /dev/<disk><parition> block device name. * to parse it out of the /dev/<disk><parition> block device name.
@ -166,9 +172,11 @@ efi_get_info(int fd, struct dk_cinfo *dki_info)
* /proc/self/fd/<fd>. Aside from the partition number we collect * /proc/self/fd/<fd>. Aside from the partition number we collect
* some additional device info. * some additional device info.
*/ */
memset(dki_info, 0, sizeof(*dki_info));
(void) sprintf(path, "/proc/self/fd/%d", fd); (void) sprintf(path, "/proc/self/fd/%d", fd);
if ((dev_path = realpath(path, NULL)) == NULL) dev_path = realpath(path, NULL);
free(path);
if (dev_path == NULL)
goto error; goto error;
if ((strncmp(dev_path, "/dev/sd", 7) == 0)) { if ((strncmp(dev_path, "/dev/sd", 7) == 0)) {

2
lib/libnvpair/Makefile.am
View File

@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/nvpair/include \ -I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libnvpair/include \

2
lib/libspl/Makefile.am
View File

@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
SUBDIRS = include $(TARGET_ASM_DIR) SUBDIRS = include $(TARGET_ASM_DIR)
DIST_SUBDIRS = include asm-generic asm-i386 asm-x86_64 DIST_SUBDIRS = include asm-generic asm-i386 asm-x86_64

2
lib/libunicode/Makefile.am
View File

@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/unicode/include \ -I${top_srcdir}/module/unicode/include \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include

2
lib/libuutil/Makefile.am
View File

@ -1,5 +1,7 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libuutil/include \ -I${top_srcdir}/lib/libuutil/include \
-I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libspl/include \

2
lib/libzpool/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += $(FRAME_LARGER_THAN) AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
SUBDIRS = include SUBDIRS = include
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \