Hello community, here is the log from the commit of package drbd for openSUSE:Factory checked in at 2018-12-11 15:47:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drbd (Old) and /work/SRC/openSUSE:Factory/.drbd.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd" Tue Dec 11 15:47:56 2018 rev:73 rq:656770 version:9.0.16+git.ab9777df Changes: -------- --- /work/SRC/openSUSE:Factory/drbd/drbd.changes 2018-11-22 13:25:27.670003999 +0100 +++ /work/SRC/openSUSE:Factory/.drbd.new.19453/drbd.changes 2018-12-11 15:48:04.170190724 +0100 @@ -1,0 +2,8 @@ +Mon Dec 10 08:06:53 UTC 2018 - nw...@suse.com + +- bsc#1118841, kernel compatible issue. + Have bioset_init but no bioset_initialized +- Add patch compat_no_bioset_initialized.patch + Remove patch compat_have_mempool_init.patch + +------------------------------------------------------------------- Old: ---- compat_have_mempool_init.patch New: ---- compat_no_bioset_initialized.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd.spec ++++++ --- /var/tmp/diff_new_pack.y4ufm7/_old 2018-12-11 15:48:04.778190054 +0100 +++ /var/tmp/diff_new_pack.y4ufm7/_new 2018-12-11 15:48:04.790190041 +0100 @@ -36,7 +36,7 @@ Source2: Module.supported Source3: drbd_git_revision Patch1: fix-resync-finished-with-syncs-have-bits-set.patch -Patch2: compat_have_mempool_init.patch +Patch2: compat_no_bioset_initialized.patch BuildRequires: kernel-source BuildRequires: kernel-syms BuildRequires: libelf-devel ++++++ compat_no_bioset_initialized.patch ++++++ diff -Naur drbd-9.0.16+git.ab9777df.orig/drbd/drbd-kernel-compat/drbd_wrappers.h drbd-9.0.16+git.ab9777df/drbd/drbd-kernel-compat/drbd_wrappers.h --- drbd-9.0.16+git.ab9777df.orig/drbd/drbd-kernel-compat/drbd_wrappers.h 2018-12-10 15:36:51.485109170 +0800 +++ drbd-9.0.16+git.ab9777df/drbd/drbd-kernel-compat/drbd_wrappers.h 2018-12-10 16:13:27.248289076 +0800 @@ -1397,14 +1397,23 @@ *pool = mempool_create_slab_pool(min_nr, mem_cache); return *pool == NULL ? -ENOMEM : 0; } +#ifndef COMPAT_HAVE_BIOSET_INITIALIZED static inline bool bioset_initialized(struct bio_set **bs) { return *bs != NULL; } +#endif #else #define DRBD_MEMPOOL_T mempool_t #define DRBD_BIO_SET bio_set +#ifndef COMPAT_HAVE_BIOSET_INITIALIZED +static inline bool +bioset_initialized(struct bio_set *bs) +{ + return bs->bio_slab != NULL; +} +#endif #endif #endif diff -Naur drbd-9.0.16+git.ab9777df.orig/drbd/drbd-kernel-compat/tests/have_bioset_initialized.c drbd-9.0.16+git.ab9777df/drbd/drbd-kernel-compat/tests/have_bioset_initialized.c --- drbd-9.0.16+git.ab9777df.orig/drbd/drbd-kernel-compat/tests/have_bioset_initialized.c 1970-01-01 08:00:00.000000000 +0800 +++ drbd-9.0.16+git.ab9777df/drbd/drbd-kernel-compat/tests/have_bioset_initialized.c 2018-12-10 16:18:02.952053971 +0800 @@ -0,0 +1,14 @@ +#include <linux/bio.h> +/* +With linux v4.18 biosets get embedded +commit 917a38c71af82185c39e31589587591fa764fb85 +Author: Kent Overstreet <kent.overstr...@gmail.com> +Date: Tue May 8 21:33:51 2018 -0400 +*/ + +static inline bool foo(void) +{ + struct bio_set bio_set; + + return bioset_initialized(&bio_set); +}