Merge pull request openzfs#80 from ctuffli/linux-build

Fix build on Linux

Author: mattmacy

cmd/zpool/zpool_vdev.c cmd/zpool/linux_zpool_vdev.c

@@ -223,7 +223,7 @@ AC_DEFUN([ZFS_AC_KERNEL], [
 
 	AC_MSG_CHECKING([kernel source directory])
 	AS_IF([test -z "$kernelsrc"], [
-		AS_IF([BUILD_FREEBSD], [
+		AS_IF([test "$BUILD_FREEBSD"], [
 			sourcelink="/usr/src/sys"
 		], [test -e "/lib/modules/$(uname -r)/source"], [
 			headersdir="/lib/modules/$(uname -r)/source"
@@ -260,7 +260,7 @@ AC_DEFUN([ZFS_AC_KERNEL], [
 
 	AC_MSG_CHECKING([kernel build directory])
 	AS_IF([test -z "$kernelbuild"], [
-		AS_IF([BUILD_FREEBSD], [
+		AS_IF([test "$BUILD_FREEBSD"], [
 			kernelbuild="/usr/obj/${kernelsrc}"
 		], [test x$withlinux != xyes -a -e "/lib/modules/$(uname -r)/build"], [
 			kernelbuild=`readlink -f /lib/modules/$(uname -r)/build`

config/kernel.m4

@@ -65,6 +65,8 @@ ZFS_AC_DEBUG_KMEM_TRACKING
 AM_COND_IF([BUILD_LINUX], [AC_CONFIG_FILES([
 	udev/Makefile
 	udev/rules.d/Makefile
+	include/spl/Makefile
+	include/spl/sys/Makefile
 	include/linux/Makefile
 	etc/systemd/Makefile
 	etc/systemd/system/Makefile

configure.ac

@@ -117,6 +117,7 @@ typedef enum {
 	ZFS_PROP_READONLY,
 	ZFS_PROP_ZONED,
 	ZFS_PROP_SNAPDIR,
+	ZFS_PROP_PRIVATE,		/* not exposed to the user, temporary */
 	ZFS_PROP_ACLMODE,
 	ZFS_PROP_ACLINHERIT,
 	ZFS_PROP_CREATETXG,

include/sys/fs/zfs.h

@@ -1,11 +1,14 @@
 # NB: GNU Automake Manual, Chapter 8.3.5: Libtool Convenience Libraries
 # These six libraries are intermediary build components.
-SUBDIRS = libavl libicp libshare libspl libtpool libzutil libunicode
+SUBDIRS = libavl libicp libshare libspl libtpool
 
 if BUILD_LINUX
 SUBDIRS+= libefi
 endif
 
+# libzutil depends on libefi if present
+SUBDIRS+= libzutil libunicode
+
 # These four libraries, which are installed as the final build product,
 # incorporate the six convenience libraries given above.
 SUBDIRS += libuutil libnvpair libzpool libzfs_core libzfs

lib/Makefile.am

@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <mntent.h>
+#include <sys/errno.h>
 #include <sys/mnttab.h>
 
 #include <sys/types.h>
@@ -82,7 +83,7 @@ _sol_getmntent(FILE *fp, struct mnttab *mgetp)
 }
 
 static int
-_linux_getextmntent(FILE *fp, struct extmnttab *mp, int len)
+linux_getextmntent(FILE *fp, struct extmnttab *mp, int len)
 {
 	int ret;
 	struct stat64 st;
@@ -104,10 +105,11 @@ _linux_getextmntent(FILE *fp, struct extmnttab *mp, int len)
 int
 getextmntent(const char *path, struct extmnttab *entry, struct stat64 *statbuf)
 {
-	int ret;
 	struct stat64 st;
+	FILE *fp;
+	int match;
 
-	if (strlen(fullpath) >= MAXPATHLEN) {
+	if (strlen(path) >= MAXPATHLEN) {
 		(void) fprintf(stderr, "invalid object; pathname too long\n");
 		return (-1);
 	}
@@ -118,9 +120,9 @@ getextmntent(const char *path, struct extmnttab *entry, struct stat64 *statbuf)
 	 * or "//"), we stat() the path and search for the corresponding
 	 * (major,minor) device pair.
 	 */
-	if (stat64(fullpath, statbuf) != 0) {
+	if (stat64(path, statbuf) != 0) {
 		(void) fprintf(stderr, "cannot open '%s': %s\n",
-		    fullpath, strerror(errno));
+		    path, strerror(errno));
 		return (-1);
 	}
 
@@ -139,22 +141,22 @@ getextmntent(const char *path, struct extmnttab *entry, struct stat64 *statbuf)
 	 */
 
 	match = 0;
-	while (linux_getextmntent(fp, &mp, sizeof (mp)) == 0) {
-		if (makedev(mp.mnt_major, mp.mnt_minor) == statbuf->st_dev) {
+	while (linux_getextmntent(fp, entry, sizeof (*entry)) == 0) {
+		if (makedev(entry->mnt_major, entry->mnt_minor) == statbuf->st_dev) {
 			match = 1;
 			break;
 		}
 	}
 
 	if (!match) {
 		(void) fprintf(stderr, "cannot find mountpoint for '%s'\n",
-		    fullpath);
+		    path);
 		return (-1);
 	}
 
-	if (stat64(mp->mnt_mountp, &st) != 0) {
-		mp->mnt_major = 0;
-		mp->mnt_minor = 0;
+	if (stat64(entry->mnt_mountp, &st) != 0) {
+		entry->mnt_major = 0;
+		entry->mnt_minor = 0;
 		return (-1);
 	}
 

lib/libspl/linux_getmntany.c

@@ -1119,10 +1119,10 @@ zfs_share_proto(zfs_handle_t *zhp, zfs_share_proto_t *proto)
 	char shareopts[ZFS_MAXPROPLEN];
 	char sourcestr[ZFS_MAXPROPLEN];
 	libzfs_handle_t *hdl = zhp->zfs_hdl;
-	sa_share_t share __unused;
+	sa_share_t share __attribute__((unused));
 	zfs_share_proto_t *curr_proto;
 	zprop_source_t sourcetype;
-	int err, ret __unused;
+	int err, ret __attribute__((unused));
 
 	if (!zfs_is_mountable(zhp, mountpoint, sizeof (mountpoint), NULL))
 		return (0);

lib/libzfs/libzfs_mount.c

@@ -15,6 +15,11 @@ AM_CFLAGS += $(FRAME_LARGER_THAN)
 
 AM_CFLAGS += -DLIB_ZPOOL_BUILD
 
+if BUILD_LINUX
+# To pick up files like qat.h
+AM_CFLAGS += -I$(top_srcdir)/module/os/linux/zfs
+endif
+
 DEFAULT_INCLUDES += \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/lib/libspl/include

lib/libzpool/Makefile.am

@@ -3,6 +3,8 @@ include $(top_srcdir)/config/Rules.am
 # Suppress unused but set variable warnings often due to ASSERTs
 AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE)
 
+AM_CFLAGS += -DLIBZUTIL_PRIVATE
+
 DEFAULT_INCLUDES += \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/lib/libspl/include
@@ -19,8 +21,6 @@ if BUILD_FREEBSD
 USER_C += \
 	freebsd_mnttab.c \
 	freebsd_zutil_import.c
-
-AM_CFLAGS += -DLIBZUTIL_PRIVATE
 endif
 
 nodist_libzutil_la_SOURCES = $(USER_C)

lib/libzutil/Makefile.am

@@ -307,7 +307,7 @@ zfs_dev_is_dm(const char *dev_name)
 int
 zfs_dev_is_whole_disk(const char *dev_name)
 {
-	struct dk_gpt *label __unused;
+	struct dk_gpt *label __attribute__((unused));
 	int fd;
 
 	if ((fd = open(dev_name, O_RDONLY | O_DIRECT)) < 0)

lib/libzutil/zutil_device_path.c

@@ -1893,7 +1893,7 @@ zpool_find_import_scan(libpc_handle_t *hdl, pthread_mutex_t *lock,
 	return (error);
 }
 
-static char *
+char *
 zpool_default_import_path[DEFAULT_IMPORT_PATH_SIZE] = {
 	"/dev/disk/by-vdev",	/* Custom rules, use first if they exist */
 	"/dev/mapper",		/* Use multipath devices before components */

lib/libzutil/zutil_import.c

@@ -50,9 +50,6 @@ typedef void *(*parse_url_t)(const char *);
 #endif
 #endif
 
-int zcommon_init(void);
-void zcommon_fini(void);
-
 static zprop_desc_t zfs_prop_table[ZFS_NUM_PROPS];
 
 /* Note this is indexed by zfs_userquota_prop_t, keep the order the same */
@@ -885,6 +882,7 @@ zfs_prop_align_right(zfs_prop_t prop)
 
 #endif
 
+#if defined(_KERNEL)
 int __init
 zcommon_init(void)
 {
@@ -898,7 +896,7 @@ zcommon_fini(void)
 	fletcher_4_fini();
 }
 
-#if defined(_KERNEL) && defined(__linux__)
+#if defined(__linux__)
 module_init(zcommon_init);
 module_exit(zcommon_fini);
 
@@ -932,4 +930,6 @@ EXPORT_SYMBOL(zfs_prop_string_to_index);
 EXPORT_SYMBOL(zfs_prop_valid_for_type);
 EXPORT_SYMBOL(zfs_prop_written);
 
-#endif
+#endif /* __linux__ */
+
+#endif /* _KERNEL */