rebase discard enable patch and enable it

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/patchdir/enable-issue-discard.patch b/patchdir/enable-issue-discard.patch
index 670dc5b016f1d658b455561c2cac5e5b94442f1e..8509cbaf8c240f16131a1485608f354e5ce95655 100644 (file)
--- a/patchdir/enable-issue-discard.patch
+++ b/patchdir/enable-issue-discard.patch
@@ -1,8 +1,6 @@
-Index: new/doc/example.conf.in
-===================================================================
---- new.orig/doc/example.conf.in       2012-03-02 22:49:43.000000000 +0100
-+++ new/doc/example.conf.in    2013-03-29 06:58:15.000000000 +0100
-@@ -185,7 +185,7 @@
+--- a/conf/example.conf.in
++++ b/conf/example.conf.in
+@@ -290,7 +290,7 @@
      # to 1, discards will only be issued if both the storage and kernel provide
      # support.
      # 1 enables; 0 disables.

diff --git a/patchdir/series b/patchdir/series
index e5cbcdc0e8a9c333dbce6080e76600547e6b73c4..e36a0ca9443baa530a896b8186a0860cbc27908b 100644 (file)
--- a/patchdir/series
+++ b/patchdir/series
@@ -5,7 +5,6 @@
 #remove-udebs.patch
 ##autodetect-locking-type.patch
 ##suppress-error-messages.patch
-#enable-issue-discard.patch
 ##allow-new-symbols.patch
 ##fix-udev-rules.patch
 #fix-clvm-init.patch
@@ -16,3 +15,4 @@ configure-with-corosync2.patch
 fix-changelog.patch
 fix-symbols.patch
 filter_zvols_and_pve_vg_in_lvm.conf.patch
+enable-issue-discard.patch