Add support for DISCARD to ZVOLs.

DISCARD (REQ_DISCARD, BLKDISCARD) is useful for thin provisioning.
It allows ZVOL clients to discard (unmap, trim) block ranges from
a ZVOL, thus optimizing disk space usage by allowing a ZVOL to
shrink instead of just grow.

We can't use zfs_space() or zfs_freesp() here, since these functions
only work on regular files, not volumes. Fortunately we can use the
low-level function dmu_free_long_range() which does exactly what we
want.

Currently the discard operation is not added to the log. That's not
a big deal since losing discard requests cannot result in data
corruption. It would however result in disk space usage higher than
it should be. Thus adding log support to zvol_discard() is probably
a good idea for a future improvement.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/Makefile.in b/Makefile.in
index 64deb23..67412c6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,6 +72,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/cmd/Makefile.in b/cmd/Makefile.in
index 4a38f36..b362f4b 100644 (file)
--- a/cmd/Makefile.in
+++ b/cmd/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/cmd/mount_zfs/Makefile.in b/cmd/mount_zfs/Makefile.in
index 273e205..5945bd1 100644 (file)
--- a/cmd/mount_zfs/Makefile.in
+++ b/cmd/mount_zfs/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/cmd/sas_switch_id/Makefile.in b/cmd/sas_switch_id/Makefile.in
index 73a22c4..64d07e0 100644 (file)
--- a/cmd/sas_switch_id/Makefile.in
+++ b/cmd/sas_switch_id/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in
index 5ce100d..0c99ae8 100644 (file)
--- a/cmd/zdb/Makefile.in
+++ b/cmd/zdb/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in
index 81f778a..7194160 100644 (file)
--- a/cmd/zfs/Makefile.in
+++ b/cmd/zfs/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in
index 644c0b2..08aaa40 100644 (file)
--- a/cmd/zinject/Makefile.in
+++ b/cmd/zinject/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in
index e270f37..8ab6938 100644 (file)
--- a/cmd/zpios/Makefile.in
+++ b/cmd/zpios/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in
index 8162037..85d09af 100644 (file)
--- a/cmd/zpool/Makefile.in
+++ b/cmd/zpool/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/cmd/zpool_id/Makefile.in b/cmd/zpool_id/Makefile.in
index 578fdbb..204efe8 100644 (file)
--- a/cmd/zpool_id/Makefile.in
+++ b/cmd/zpool_id/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/cmd/zpool_layout/Makefile.in b/cmd/zpool_layout/Makefile.in
index b89e9e8..09ed6de 100644 (file)
--- a/cmd/zpool_layout/Makefile.in
+++ b/cmd/zpool_layout/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in
index 70532fb..f6c5ded 100644 (file)
--- a/cmd/ztest/Makefile.in
+++ b/cmd/ztest/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/cmd/zvol_id/Makefile.in b/cmd/zvol_id/Makefile.in
index 6bacf99..f369599 100644 (file)
--- a/cmd/zvol_id/Makefile.in
+++ b/cmd/zvol_id/Makefile.in
@@ -52,6 +52,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/config/kernel-blk-queue-discard.m4 b/config/kernel-blk-queue-discard.m4
new file mode 100644 (file)
index 0000000..3e5147a
--- /dev/null
+++ b/config/kernel-blk-queue-discard.m4
@@ -0,0 +1,22 @@
+dnl #
+dnl # 2.6.32 API change
+dnl # Discard requests were moved to the normal I/O path.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_DISCARD], [
+       AC_MSG_CHECKING([whether blk_queue_discard() is available])
+       tmp_flags="$EXTRA_KCFLAGS"
+       EXTRA_KCFLAGS="-Wno-unused-but-set-variable"
+       ZFS_LINUX_TRY_COMPILE([
+               #include <linux/blkdev.h>
+       ],[
+               struct request_queue *q = NULL;
+               (void) blk_queue_discard(q);
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_BLK_QUEUE_DISCARD, 1,
+                         [blk_queue_discard() is available])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+       EXTRA_KCFLAGS="$tmp_flags"
+])

diff --git a/config/kernel.m4 b/config/kernel.m4
index c41cdf6..0adcead 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -27,6 +27,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_BLK_QUEUE_PHYSICAL_BLOCK_SIZE
        ZFS_AC_KERNEL_BLK_QUEUE_IO_OPT
        ZFS_AC_KERNEL_BLK_QUEUE_NONROT
+       ZFS_AC_KERNEL_BLK_QUEUE_DISCARD
        ZFS_AC_KERNEL_BLK_FETCH_REQUEST
        ZFS_AC_KERNEL_BLK_REQUEUE_REQUEST
        ZFS_AC_KERNEL_BLK_RQ_BYTES

diff --git a/configure b/configure
index 4288ca6..0b00c6d 100755 (executable)
--- a/configure
+++ b/configure
@@ -14159,6 +14159,75 @@ fi
        EXTRA_KCFLAGS="$tmp_flags"
 
 
+       { $as_echo "$as_me:$LINENO: checking whether blk_queue_discard() is available" >&5
+$as_echo_n "checking whether blk_queue_discard() is available... " >&6; }
+       tmp_flags="$EXTRA_KCFLAGS"
+       EXTRA_KCFLAGS="-Wno-unused-but-set-variable"
+
+
+cat confdefs.h - <<_ACEOF >conftest.c
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+               #include <linux/blkdev.h>
+
+int
+main (void)
+{
+
+               struct request_queue *q = NULL;
+               (void) blk_queue_discard(q);
+
+  ;
+  return 0;
+}
+
+_ACEOF
+
+
+       rm -Rf build && mkdir -p build
+       echo "obj-m := conftest.o" >build/Makefile
+       if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+               { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_BLK_QUEUE_DISCARD 1
+_ACEOF
+
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+               { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+
+
+fi
+
+       rm -Rf build
+
+
+       EXTRA_KCFLAGS="$tmp_flags"
+
+
        { $as_echo "$as_me:$LINENO: checking whether blk_fetch_request() is available" >&5
 $as_echo_n "checking whether blk_fetch_request() is available... " >&6; }
        tmp_flags="$EXTRA_KCFLAGS"
@@ -19977,6 +20046,75 @@ fi
        EXTRA_KCFLAGS="$tmp_flags"
 
 
+       { $as_echo "$as_me:$LINENO: checking whether blk_queue_discard() is available" >&5
+$as_echo_n "checking whether blk_queue_discard() is available... " >&6; }
+       tmp_flags="$EXTRA_KCFLAGS"
+       EXTRA_KCFLAGS="-Wno-unused-but-set-variable"
+
+
+cat confdefs.h - <<_ACEOF >conftest.c
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+               #include <linux/blkdev.h>
+
+int
+main (void)
+{
+
+               struct request_queue *q = NULL;
+               (void) blk_queue_discard(q);
+
+  ;
+  return 0;
+}
+
+_ACEOF
+
+
+       rm -Rf build && mkdir -p build
+       echo "obj-m := conftest.o" >build/Makefile
+       if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+               { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_BLK_QUEUE_DISCARD 1
+_ACEOF
+
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+               { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+
+
+fi
+
+       rm -Rf build
+
+
+       EXTRA_KCFLAGS="$tmp_flags"
+
+
        { $as_echo "$as_me:$LINENO: checking whether blk_fetch_request() is available" >&5
 $as_echo_n "checking whether blk_fetch_request() is available... " >&6; }
        tmp_flags="$EXTRA_KCFLAGS"

diff --git a/dracut/90zfs/Makefile.in b/dracut/90zfs/Makefile.in
index f574205..0725bbc 100644 (file)
--- a/dracut/90zfs/Makefile.in
+++ b/dracut/90zfs/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/dracut/Makefile.in b/dracut/Makefile.in
index a9f8be2..1544385 100644 (file)
--- a/dracut/Makefile.in
+++ b/dracut/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 2cb43ca..1473768 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/etc/init.d/Makefile.in b/etc/init.d/Makefile.in
index 73f07f4..cbed8c0 100644 (file)
--- a/etc/init.d/Makefile.in
+++ b/etc/init.d/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/etc/zfs/Makefile.in b/etc/zfs/Makefile.in
index 8024d30..e161cb4 100644 (file)
--- a/etc/zfs/Makefile.in
+++ b/etc/zfs/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/include/Makefile.in b/include/Makefile.in
index d7423a3..9f39727 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/include/linux/Makefile.in b/include/linux/Makefile.in
index d18e5dd..9c69b62 100644 (file)
--- a/include/linux/Makefile.in
+++ b/include/linux/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h
index 56a1baf..bd1b2bf 100644 (file)
--- a/include/linux/blkdev_compat.h
+++ b/include/linux/blkdev_compat.h
@@ -425,6 +425,14 @@ bio_set_flags_failfast(struct block_device *bdev, int *flags)
 #endif
 
 /*
+ * 2.6.32 API change
+ * Use the normal I/O patch for discards.
+ */
+#ifdef REQ_DISCARD
+# define VDEV_REQ_DISCARD              REQ_DISCARD
+#endif
+
+/*
  * Default Linux IO Scheduler,
  * Setting the scheduler to noop will allow the Linux IO scheduler to
  * still perform front and back merging, while leaving the request

diff --git a/include/sys/Makefile.in b/include/sys/Makefile.in
index 06c2047..91fd34b 100644 (file)
--- a/include/sys/Makefile.in
+++ b/include/sys/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/include/sys/fm/Makefile.in b/include/sys/fm/Makefile.in
index 245995d..0dcd27b 100644 (file)
--- a/include/sys/fm/Makefile.in
+++ b/include/sys/fm/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/include/sys/fm/fs/Makefile.in b/include/sys/fm/fs/Makefile.in
index 10dcd83..03c32de 100644 (file)
--- a/include/sys/fm/fs/Makefile.in
+++ b/include/sys/fm/fs/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/include/sys/fs/Makefile.in b/include/sys/fs/Makefile.in
index ee2f168..1f8de0f 100644 (file)
--- a/include/sys/fs/Makefile.in
+++ b/include/sys/fs/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 43bdf0d..daaf306 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in
index d909fa6..d28c6ac 100644 (file)
--- a/lib/libavl/Makefile.in
+++ b/lib/libavl/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libefi/Makefile.in b/lib/libefi/Makefile.in
index a0595ce..4a93578 100644 (file)
--- a/lib/libefi/Makefile.in
+++ b/lib/libefi/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in
index 533d962..e982a68 100644 (file)
--- a/lib/libnvpair/Makefile.in
+++ b/lib/libnvpair/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libshare/Makefile.in b/lib/libshare/Makefile.in
index 8390ce8..61b61a7 100644 (file)
--- a/lib/libshare/Makefile.in
+++ b/lib/libshare/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in
index 541f72b..2d1a8ad 100644 (file)
--- a/lib/libspl/Makefile.in
+++ b/lib/libspl/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libspl/asm-generic/Makefile.in b/lib/libspl/asm-generic/Makefile.in
index 974f489..63b0ef3 100644 (file)
--- a/lib/libspl/asm-generic/Makefile.in
+++ b/lib/libspl/asm-generic/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libspl/asm-i386/Makefile.in b/lib/libspl/asm-i386/Makefile.in
index f84cd39..2d43d89 100644 (file)
--- a/lib/libspl/asm-i386/Makefile.in
+++ b/lib/libspl/asm-i386/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libspl/asm-x86_64/Makefile.in b/lib/libspl/asm-x86_64/Makefile.in
index 23c4b29..c6d61a5 100644 (file)
--- a/lib/libspl/asm-x86_64/Makefile.in
+++ b/lib/libspl/asm-x86_64/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libspl/include/Makefile.in b/lib/libspl/include/Makefile.in
index 043f0fe..ab1d851 100644 (file)
--- a/lib/libspl/include/Makefile.in
+++ b/lib/libspl/include/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libspl/include/ia32/Makefile.in b/lib/libspl/include/ia32/Makefile.in
index dad5d85..f1f6cb8 100644 (file)
--- a/lib/libspl/include/ia32/Makefile.in
+++ b/lib/libspl/include/ia32/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libspl/include/ia32/sys/Makefile.in b/lib/libspl/include/ia32/sys/Makefile.in
index d7ea24f..70eb6a3 100644 (file)
--- a/lib/libspl/include/ia32/sys/Makefile.in
+++ b/lib/libspl/include/ia32/sys/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libspl/include/rpc/Makefile.in b/lib/libspl/include/rpc/Makefile.in
index 3a0b3a1..a217ab6 100644 (file)
--- a/lib/libspl/include/rpc/Makefile.in
+++ b/lib/libspl/include/rpc/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libspl/include/sys/Makefile.in b/lib/libspl/include/sys/Makefile.in
index b8663bd..efa77ad 100644 (file)
--- a/lib/libspl/include/sys/Makefile.in
+++ b/lib/libspl/include/sys/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libspl/include/sys/dktp/Makefile.in b/lib/libspl/include/sys/dktp/Makefile.in
index e5c3537..1656d9d 100644 (file)
--- a/lib/libspl/include/sys/dktp/Makefile.in
+++ b/lib/libspl/include/sys/dktp/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libspl/include/sys/sysevent/Makefile.in b/lib/libspl/include/sys/sysevent/Makefile.in
index edb36b0..5a37394 100644 (file)
--- a/lib/libspl/include/sys/sysevent/Makefile.in
+++ b/lib/libspl/include/sys/sysevent/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libspl/include/util/Makefile.in b/lib/libspl/include/util/Makefile.in
index 301fde5..8894eb5 100644 (file)
--- a/lib/libspl/include/util/Makefile.in
+++ b/lib/libspl/include/util/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in
index 3e3cb2d..6135529 100644 (file)
--- a/lib/libunicode/Makefile.in
+++ b/lib/libunicode/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in
index 1fb5e57..e101188 100644 (file)
--- a/lib/libuutil/Makefile.in
+++ b/lib/libuutil/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in
index 9ba47ca..84e9e2a 100644 (file)
--- a/lib/libzfs/Makefile.in
+++ b/lib/libzfs/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in
index fc071e2..6c6b3b1 100644 (file)
--- a/lib/libzpool/Makefile.in
+++ b/lib/libzpool/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/man/Makefile.in b/man/Makefile.in
index 8e98be3..1552a21 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/man/man8/Makefile.in b/man/man8/Makefile.in
index 12524ff..5d1fcd7 100644 (file)
--- a/man/man8/Makefile.in
+++ b/man/man8/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index 19888ea..9b13134 100644 (file)
--- a/module/zfs/zvol.c
+++ b/module/zfs/zvol.c
@@ -574,6 +574,42 @@ zvol_write(void *arg)
        blk_end_request(req, -error, size);
 }
 
+#ifdef HAVE_BLK_QUEUE_DISCARD
+static void
+zvol_discard(void *arg)
+{
+       struct request *req = (struct request *)arg;
+       struct request_queue *q = req->q;
+       zvol_state_t *zv = q->queuedata;
+       uint64_t offset = blk_rq_pos(req) << 9;
+       uint64_t size = blk_rq_bytes(req);
+       int error;
+       rl_t *rl;
+
+       if (offset + size > zv->zv_volsize) {
+               blk_end_request(req, -EIO, size);
+               return;
+       }
+
+       if (size == 0) {
+               blk_end_request(req, 0, size);
+               return;
+       }
+
+       rl = zfs_range_lock(&zv->zv_znode, offset, size, RL_WRITER);
+
+       error = dmu_free_long_range(zv->zv_objset, ZVOL_OBJ, offset, size);
+
+       /*
+        * TODO: maybe we should add the operation to the log.
+        */
+
+       zfs_range_unlock(rl);
+
+       blk_end_request(req, -error, size);
+}
+#endif /* HAVE_BLK_QUEUE_DISCARD */
+
 /*
  * Common read path running under the zvol taskq context.  This function
  * is responsible for copying the requested data out of the DMU and in to
@@ -674,6 +710,13 @@ zvol_request(struct request_queue *q)
                                break;
                        }
 
+#ifdef HAVE_BLK_QUEUE_DISCARD
+                       if (req->cmd_flags & VDEV_REQ_DISCARD) {
+                               zvol_dispatch(zvol_discard, req);
+                               break;
+                       }
+#endif /* HAVE_BLK_QUEUE_DISCARD */
+
                        zvol_dispatch(zvol_write, req);
                        break;
                default:
@@ -1193,6 +1236,10 @@ __zvol_create_minor(const char *name)
        blk_queue_max_segment_size(zv->zv_queue, UINT_MAX);
        blk_queue_physical_block_size(zv->zv_queue, zv->zv_volblocksize);
        blk_queue_io_opt(zv->zv_queue, zv->zv_volblocksize);
+#ifdef HAVE_BLK_QUEUE_DISCARD
+       blk_queue_max_discard_sectors(zv->zv_queue, UINT_MAX);
+       queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, zv->zv_queue);
+#endif
 #ifdef HAVE_BLK_QUEUE_NONROT
        queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zv->zv_queue);
 #endif

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index f8316f9..a3822d9 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/scripts/zpios-profile/Makefile.in b/scripts/zpios-profile/Makefile.in
index 0264aa4..ed4e319 100644 (file)
--- a/scripts/zpios-profile/Makefile.in
+++ b/scripts/zpios-profile/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/scripts/zpios-test/Makefile.in b/scripts/zpios-test/Makefile.in
index b5d5d25..637dfd7 100644 (file)
--- a/scripts/zpios-test/Makefile.in
+++ b/scripts/zpios-test/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/scripts/zpool-config/Makefile.in b/scripts/zpool-config/Makefile.in
index 73c3249..6afa78f 100644 (file)
--- a/scripts/zpool-config/Makefile.in
+++ b/scripts/zpool-config/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/scripts/zpool-layout/Makefile.in b/scripts/zpool-layout/Makefile.in
index 70545c4..ca09273 100644 (file)
--- a/scripts/zpool-layout/Makefile.in
+++ b/scripts/zpool-layout/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/udev/Makefile.in b/udev/Makefile.in
index 018d0a7..6b20a9f 100644 (file)
--- a/udev/Makefile.in
+++ b/udev/Makefile.in
@@ -49,6 +49,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/udev/rules.d/Makefile.in b/udev/rules.d/Makefile.in
index 671fb7b..fe559cd 100644 (file)
--- a/udev/rules.d/Makefile.in
+++ b/udev/rules.d/Makefile.in
@@ -50,6 +50,7 @@ am__aclocal_m4_deps =  \
        $(top_srcdir)/config/kernel-bio-rw-syncio.m4 \
        $(top_srcdir)/config/kernel-blk-end-request.m4 \
        $(top_srcdir)/config/kernel-blk-fetch-request.m4 \
+       $(top_srcdir)/config/kernel-blk-queue-discard.m4 \
        $(top_srcdir)/config/kernel-blk-queue-flush.m4 \
        $(top_srcdir)/config/kernel-blk-queue-io-opt.m4 \
        $(top_srcdir)/config/kernel-blk-queue-max-hw-sectors.m4 \

diff --git a/zfs_config.h.in b/zfs_config.h.in
index c91735a..887f0f7 100644 (file)
--- a/zfs_config.h.in
+++ b/zfs_config.h.in
@@ -51,6 +51,9 @@
 /* blk_fetch_request() is available */
 #undef HAVE_BLK_FETCH_REQUEST
 
+/* blk_queue_discard() is available */
+#undef HAVE_BLK_QUEUE_DISCARD
+
 /* blk_queue_flush() is available */
 #undef HAVE_BLK_QUEUE_FLUSH