From e26ad2500c325eb4f014591e953afecb01413d5ba71419fd74d029071fb42ad2 Mon Sep 17 00:00:00 2001 From: nick wang Date: Wed, 4 Nov 2020 05:22:39 +0000 Subject: [PATCH] Accepting request 845859 from home:wanghaisu:branches:network:ha-clustering:Factory bsc#1178388, build error with -Wreturn-type OBS-URL: https://build.opensuse.org/request/show/845859 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=121 --- drbd.changes | 6 ++++++ drbd.spec | 2 ++ fix-err-of-wrong-return-type.patch | 11 +++++++++++ 3 files changed, 19 insertions(+) create mode 100644 fix-err-of-wrong-return-type.patch diff --git a/drbd.changes b/drbd.changes index 7e872a1..60fc48c 100644 --- a/drbd.changes +++ b/drbd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 3 11:21:13 UTC 2020 - nick wang + +- bsc#1178388, build error with -Wreturn-type + Add patch fix-err-of-wrong-return-type.patch + ------------------------------------------------------------------- Tue Oct 20 03:49:16 UTC 2020 - nick wang diff --git a/drbd.spec b/drbd.spec index aac5125..5d783c4 100644 --- a/drbd.spec +++ b/drbd.spec @@ -45,6 +45,7 @@ Patch7: compat_generic_make_request.patch Patch8: blk_alloc_queue_make_request.patch Patch9: remove_congested_fn_congested_data.patch Patch10: compat_blk_queue_stack_limits.patch +Patch11: fix-err-of-wrong-return-type.patch Patch99: suse-coccinelle.patch #https://github.com/openSUSE/rpmlint-checks/blob/master/KMPPolicyCheck.py BuildRequires: coccinelle >= 1.0.8 @@ -88,6 +89,7 @@ installed kernel. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %patch99 -p1 mkdir source diff --git a/fix-err-of-wrong-return-type.patch b/fix-err-of-wrong-return-type.patch new file mode 100644 index 0000000..18307d0 --- /dev/null +++ b/fix-err-of-wrong-return-type.patch @@ -0,0 +1,11 @@ +diff -Naur drbd-9.0.16+git.ab9777df.orig/drbd/drbd-kernel-compat/tests/have_blk_qc_t_make_request.c drbd-9.0.16+git.ab9777df/drbd/drbd-kernel-compat/tests/have_blk_qc_t_make_request.c +--- drbd-9.0.16+git.ab9777df.orig/drbd/drbd-kernel-compat/tests/have_blk_qc_t_make_request.c 2020-11-03 17:45:49.362231056 +0800 ++++ drbd-9.0.16+git.ab9777df/drbd/drbd-kernel-compat/tests/have_blk_qc_t_make_request.c 2020-11-03 19:11:54.843913135 +0800 +@@ -11,6 +11,7 @@ + + blk_qc_t drbd_make_request(struct request_queue *q, struct bio *bio) + { ++ return 0; + } + + #ifndef __same_type