Hello community,

here is the log from the commit of package drbd for openSUSE:Factory checked in 
at 2015-11-26 17:01:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/drbd (Old)
 and      /work/SRC/openSUSE:Factory/.drbd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "drbd"

Changes:
--------
--- /work/SRC/openSUSE:Factory/drbd/drbd.changes        2015-10-30 
13:43:05.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.drbd.new/drbd.changes   2015-11-26 
17:01:30.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 20 06:50:29 UTC 2015 - [email protected]
+
+- BSC#955968, support GFP_RECLAIM in kernel4.4
+- Add rename-GFP_WAIT-to-GFP_RECLAIM.patch
+
+-------------------------------------------------------------------

New:
----
  rename-GFP_WAIT-to-GFP_RECLAIM.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ drbd.spec ++++++
--- /var/tmp/diff_new_pack.n7kG44/_old  2015-11-26 17:01:31.000000000 +0100
+++ /var/tmp/diff_new_pack.n7kG44/_new  2015-11-26 17:01:31.000000000 +0100
@@ -40,6 +40,7 @@
 #Patch for fate: https://fate.suse.com/317940
 #Whether can merge into linbit is under discussion
 Patch3:         0001-Support-zeroout-device-in-initial-sync.patch
+Patch4:         rename-GFP_WAIT-to-GFP_RECLAIM.patch
 
 BuildRequires:  kernel-source
 BuildRequires:  kernel-syms
@@ -76,6 +77,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 rm -rf obj

++++++ rename-GFP_WAIT-to-GFP_RECLAIM.patch ++++++
Index: drbd-8.4.6/drbd/drbd_bitmap.c
===================================================================
--- drbd-8.4.6.orig/drbd/drbd_bitmap.c
+++ drbd-8.4.6/drbd/drbd_bitmap.c
@@ -1084,7 +1084,11 @@ static void bm_page_io_async(struct drbd
        bm_set_page_unchanged(b->bm_pages[page_nr]);
 
        if (ctx->flags & BM_AIO_COPY_PAGES) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
+               page = mempool_alloc(drbd_md_io_page_pool, 
__GFP_HIGHMEM|__GFP_RECLAIM);
+#else
                page = mempool_alloc(drbd_md_io_page_pool, 
__GFP_HIGHMEM|__GFP_WAIT);
+#endif
                copy_highpage(page, b->bm_pages[page_nr]);
                bm_store_page_idx(page, page_nr);
        } else
Index: drbd-8.4.6/drbd/drbd_receiver.c
===================================================================
--- drbd-8.4.6.orig/drbd/drbd_receiver.c
+++ drbd-8.4.6/drbd/drbd_receiver.c
@@ -421,7 +421,11 @@ drbd_alloc_peer_req(struct drbd_peer_dev
        }
 
        if (has_payload && data_size) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)
+               page = drbd_alloc_pages(peer_device, nr_pages, (gfp_mask & 
__GFP_RECLAIM));
+#else
                page = drbd_alloc_pages(peer_device, nr_pages, (gfp_mask & 
__GFP_WAIT));
+#endif
                if (!page)
                        goto fail;
        }

Reply via email to