Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

config/zfs-build.m4

@@ -7,28 +7,34 @@ AC_DEFUN([ZFS_AC_LICENSE], [
 ])
 
 AC_DEFUN([ZFS_AC_DEBUG], [
-        AC_MSG_CHECKING([whether debugging is enabled])
-        AC_ARG_ENABLE( [debug],
-                AS_HELP_STRING([--enable-debug],
-                [Enable generic debug support (default off)]),
-                [ case "$enableval" in
-                        yes) zfs_ac_debug=yes ;;
-                        no)  zfs_ac_debug=no  ;;
-                        *) AC_MSG_RESULT([Error!])
-                        AC_MSG_ERROR([Bad value "$enableval" for --enable-debug]) ;;
-                esac ]
-        )
-        if test "$zfs_ac_debug" = yes; then
-        	AC_MSG_RESULT([yes])
-                KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG "
+	AC_MSG_CHECKING([whether debugging is enabled])
+	AC_ARG_ENABLE( [debug],
+		AS_HELP_STRING([--enable-debug],
+		[Enable generic debug support (default off)]),
+		[ case "$enableval" in
+			yes) zfs_ac_debug=yes ;;
+			no)  zfs_ac_debug=no  ;;
+			*) AC_MSG_RESULT([Error!])
+			AC_MSG_ERROR([Bad value "$enableval" for --enable-debug]) ;;
+		esac ]
+)
+if test "$zfs_ac_debug" = yes; then
+	AC_MSG_RESULT([yes])
+		AC_DEFINE([DEBUG], [1],
+		[Define to 1 to enable debug tracing])
+		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG "
 		HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG "
-        else
-        	AC_MSG_RESULT([no])
-                AC_DEFINE([NDEBUG], [1],
-                [Define to 1 to disable debug tracing])
-                KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
+		USERDEBUG="-DDEBUG"
+	else
+		AC_MSG_RESULT([no])
+		AC_DEFINE([NDEBUG], [1],
+		[Define to 1 to disable debug tracing])
+		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
 		HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
-        fi
+		USERDEBUG="-DNDEBUG"
+	fi
+
+	AC_SUBST(USERDEBUG)
 ])
 
 AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [

scripts/zpios.sh

@@ -33,6 +33,7 @@ DESCRIPTION:
 OPTIONS:
         -h      Show this message
         -v      Verbose
+        -f      Force everything
         -p      Enable profiling
         -c      Zpool configuration
         -t      Zpios test
@@ -173,7 +174,7 @@ ZPIOS_OPTIONS=
 ZPOOL_OPTIONS=""
 ZFS_OPTIONS=""
 
-while getopts 'hvpc:t:o:l:s:' OPTION; do
+while getopts 'hvfpc:t:o:l:s:' OPTION; do
 	case $OPTION in
 	h)
 		usage
@@ -183,6 +184,10 @@ while getopts 'hvpc:t:o:l:s:' OPTION; do
 		VERBOSE=1
 		VERBOSE_FLAG="-v"
 		;;
+	f)
+		FORCE=1
+		FORCE_FLAG="-f"
+		;;
 	p)
 		PROFILE=1
 		;;
@@ -237,7 +242,8 @@ if [ ${VERBOSE} ]; then
 fi
 
 # Create the zpool configuration
-${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} -p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} \
+${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} ${FORCE_FLAG} \
+	-p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} \
 	-l "${ZPOOL_OPTIONS}" -s "${ZFS_OPTIONS}" || exit 1
 
 if [ ${PROFILE} ]; then
@@ -256,8 +262,8 @@ if [ ${VERBOSE} ]; then
 fi
 
 # Destroy the zpool configuration
-${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} -p ${ZPOOL_NAME} \
-	-c ${ZPOOL_CONFIG} -d || exit 1
+${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} ${FORCE_FLAG} \
+	-p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} -d || exit 1
 
 # Unload the test module stack and wait for device removal
 unload_modules

scripts/zpool-create.sh

@@ -24,10 +24,10 @@ DESCRIPTION:
 OPTIONS:
         -h      Show this message
         -v      Verbose
+        -f      Force everything
         -c      Configuration for zpool
         -p      Name for zpool
         -d      Destroy zpool (default create)
-        -f      Force everything
         -l      Additional zpool options
         -s      Additional zfs options