update drbd9 driver (and remove custom fixes)

diff --git a/Makefile b/Makefile
index e098d8db8e5f3b39c7631fa50f63531058bcc3e0..9cdfac9c706873e29f76317b4fc746e2ce70c8c3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=4.0
 
 KERNEL_VER=4.2.0
-PKGREL=9
+PKGREL=10
 # also i7clude firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
@@ -313,7 +313,6 @@ update-drbd:
 drbd ${DRBD_MODULES}: .compile_mark ${DRBDSRC}
        rm -rf ${DRBDDIR}
        tar xzf ${DRBDSRC}
-       cd  ${DRBDDIR}; ln -s ../drbdpatches patches; quilt push -a
        mkdir -p /lib/modules/${KVNAME}
        ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
        cd ${DRBDDIR}; make KVER=${KVNAME}

diff --git a/changelog.Debian b/changelog.Debian
index ed56b957a19336475e8981f1df0785b7d7947206..ef452f0d43eb98d5fc1d41e2f295bf91e9bdf266 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel-4.1.3 (4.2.0-10) unstable; urgency=medium
+
+  * update drbd9 driver
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 08 Sep 2015 18:47:35 +0200
+
 pve-kernel-4.1.3 (4.2.0-9) unstable; urgency=medium
 
   * update to kernel 4.2.0

diff --git a/drbd-9.0.0.tar.gz b/drbd-9.0.0.tar.gz
index 04ce6aeb9049b1323fad826dbe17b1eabfe85c7e..96f6fdbbfdfa35d2dae7e77d93268707667e3c45 100644 (file)
Binary files a/drbd-9.0.0.tar.gz and b/drbd-9.0.0.tar.gz differ

diff --git a/drbdpatches/linux-4.2-compile-fix.patch b/drbdpatches/linux-4.2-compile-fix.patch
deleted file mode 100644 (file)
index acba427..0000000
--- a/drbdpatches/linux-4.2-compile-fix.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Index: drbd-src/drbd/drbd_main.c
-===================================================================
---- drbd-src.orig/drbd/drbd_main.c
-+++ drbd-src/drbd/drbd_main.c
-@@ -2809,7 +2809,7 @@ static void drbd_cleanup(void)
-  * @congested_data:   User data
-  * @bdi_bits:         Bits the BDI flusher thread is currently interested in
-  *
-- * Returns 1<<BDI_async_congested and/or 1<<BDI_sync_congested if we are congested.
-+ * Returns 1<<WB_async_congested and/or 1<<WB_sync_congested if we are congested.
-  */
- static int drbd_congested(void *congested_data, int bdi_bits)
- {
-@@ -2824,14 +2824,14 @@ static int drbd_congested(void *congeste
-       }
- 
-       if (test_bit(CALLBACK_PENDING, &device->resource->flags)) {
--              r |= (1 << BDI_async_congested);
-+              r |= (1 << WB_async_congested);
-               /* Without good local data, we would need to read from remote,
-                * and that would need the worker thread as well, which is
-                * currently blocked waiting for that usermode helper to
-                * finish.
-                */
-               if (!get_ldev_if_state(device, D_UP_TO_DATE))
--                      r |= (1 << BDI_sync_congested);
-+                      r |= (1 << WB_sync_congested);
-               else
-                       put_ldev(device);
-               r &= bdi_bits;
-@@ -2844,13 +2844,13 @@ static int drbd_congested(void *congeste
-               put_ldev(device);
-       }
- 
--      if (bdi_bits & (1 << BDI_async_congested)) {
-+      if (bdi_bits & (1 << WB_async_congested)) {
-               struct drbd_peer_device *peer_device;
- 
-               rcu_read_lock();
-               for_each_peer_device_rcu(peer_device, device) {
-                       if (test_bit(NET_CONGESTED, &peer_device->connection->transport.flags)) {
--                              r |= (1 << BDI_async_congested);
-+                              r |= (1 << WB_async_congested);
-                               break;
-                       }
-               }
-Index: drbd-src/drbd/drbd_nl.c
-===================================================================
---- drbd-src.orig/drbd/drbd_nl.c
-+++ drbd-src/drbd/drbd_nl.c
-@@ -4202,8 +4202,8 @@ static void device_to_statistics(struct
-               q = bdev_get_queue(device->ldev->backing_bdev);
-               s->dev_lower_blocked =
-                       bdi_congested(&q->backing_dev_info,
--                                    (1 << BDI_async_congested) |
--                                    (1 << BDI_sync_congested));
-+                                    (1 << WB_async_congested) |
-+                                    (1 << WB_sync_congested));
-               put_ldev(device);
-       }
-       s->dev_size = drbd_get_capacity(device->this_bdev);
-Index: drbd-src/drbd/drbd_transport_tcp.c
-===================================================================
---- drbd-src.orig/drbd/drbd_transport_tcp.c
-+++ drbd-src/drbd/drbd_transport_tcp.c
-@@ -373,7 +373,7 @@ static int dtt_try_connect(struct drbd_t
-       peer_addr = dtt_path(transport)->peer_addr;
- 
-       what = "sock_create_kern";
--      err = sock_create_kern(my_addr.ss_family, SOCK_STREAM, IPPROTO_TCP, &socket);
-+      err = sock_create_kern(&init_net, my_addr.ss_family, SOCK_STREAM, IPPROTO_TCP, &socket);
-       if (err < 0) {
-               socket = NULL;
-               goto out;
-@@ -695,7 +695,7 @@ static int dtt_create_listener(struct dr
-       my_addr = dtt_path(transport)->my_addr;
- 
-       what = "sock_create_kern";
--      err = sock_create_kern(my_addr.ss_family, SOCK_STREAM, IPPROTO_TCP, &s_listen);
-+      err = sock_create_kern(&init_net, my_addr.ss_family, SOCK_STREAM, IPPROTO_TCP, &s_listen);
-       if (err) {
-               s_listen = NULL;
-               goto out;
-Index: drbd-src/drbd/drbd_int.h
-===================================================================
---- drbd-src.orig/drbd/drbd_int.h
-+++ drbd-src/drbd/drbd_int.h
-@@ -40,6 +40,7 @@
- #include <linux/idr.h>
- #include <linux/lru_cache.h>
- #include <linux/prefetch.h>
-+#include <linux/backing-dev.h>
- #include <linux/drbd_genl_api.h>
- #include <linux/drbd.h>
- #include <linux/drbd_config.h>

diff --git a/drbdpatches/series b/drbdpatches/series
deleted file mode 100644 (file)
index f61f97c..0000000
--- a/drbdpatches/series
+++ /dev/null
@@ -1 +0,0 @@
-linux-4.2-compile-fix.patch