From: Greg Kroah-Hartman Date: Sun, 12 Mar 2017 19:52:04 +0000 (+0100) Subject: 4.10-stable patches X-Git-Tag: v4.4.54~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17fdf7bce6e1c08c9824d8d480de6036b03459d0;p=thirdparty%2Fkernel%2Fstable-queue.git 4.10-stable patches added patches: libceph-use-bug-instead-of-bug_on-1.patch --- diff --git a/queue-4.10/libceph-use-bug-instead-of-bug_on-1.patch b/queue-4.10/libceph-use-bug-instead-of-bug_on-1.patch new file mode 100644 index 00000000000..70ee6b5eb71 --- /dev/null +++ b/queue-4.10/libceph-use-bug-instead-of-bug_on-1.patch @@ -0,0 +1,38 @@ +From d24cdcd3e40a6825135498e11c20c7976b9bf545 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Mon, 16 Jan 2017 12:06:09 +0100 +Subject: libceph: use BUG() instead of BUG_ON(1) + +From: Arnd Bergmann + +commit d24cdcd3e40a6825135498e11c20c7976b9bf545 upstream. + +I ran into this compile warning, which is the result of BUG_ON(1) +not always leading to the compiler treating the code path as +unreachable: + + include/linux/ceph/osdmap.h: In function 'ceph_can_shift_osds': + include/linux/ceph/osdmap.h:62:1: error: control reaches end of non-void function [-Werror=return-type] + +Using BUG() here avoids the warning. + +Signed-off-by: Arnd Bergmann +Signed-off-by: Ilya Dryomov +Cc: Heinrich Schuchardt +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/ceph/osdmap.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/ceph/osdmap.h ++++ b/include/linux/ceph/osdmap.h +@@ -57,7 +57,7 @@ static inline bool ceph_can_shift_osds(s + case CEPH_POOL_TYPE_EC: + return false; + default: +- BUG_ON(1); ++ BUG(); + } + } + diff --git a/queue-4.10/series b/queue-4.10/series index 42ff0cbbee1..a016896e652 100644 --- a/queue-4.10/series +++ b/queue-4.10/series @@ -65,3 +65,4 @@ drm-i915-avoid-spurious-warns-about-the-wrong-pipe-in-the-pps-code.patch drm-i915-check-for-timeout-completion-when-waiting-for-the-rq-to-submitted.patch drm-i915-pass-timeout-0-on-to-i915_gem_object_wait_fence.patch drm-i915-fix-not-finding-the-vbt-when-it-overlaps-with-opregion_asle_ext.patch +libceph-use-bug-instead-of-bug_on-1.patch