| From d24cdcd3e40a6825135498e11c20c7976b9bf545 Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Mon, 16 Jan 2017 12:06:09 +0100 |
| Subject: libceph: use BUG() instead of BUG_ON(1) |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| 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 <arnd@arndb.de> |
| Signed-off-by: Ilya Dryomov <idryomov@gmail.com> |
| Cc: Heinrich Schuchardt <xypron.glpk@gmx.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| 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(); |
| } |
| } |
| |
