From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752611AbdAYWjL (ORCPT ); Wed, 25 Jan 2017 17:39:11 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:51867 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752483AbdAYWjK (ORCPT ); Wed, 25 Jan 2017 17:39:10 -0500 From: Arnd Bergmann To: Oleg Drokin , Andreas Dilger , James Simmons , Greg Kroah-Hartman Cc: Arnd Bergmann , Gregoire Pichon , lustre-devel@lists.lustre.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: lustre: ptlrpc: avoid warning on missing return Date: Wed, 25 Jan 2017 23:36:34 +0100 Message-Id: <20170125223804.1479716-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:J83vByO8JOavj0xKtQ1+hdmt4Hj4PnJd2Ejy38TlIHkL9vOR20d ysSbKtpWA49HEPklOcLL+yK+/aT72YExJNntsSAx7p52lMTnQBVmsROmzct1Iq5k46b2oDe 7G7y+LkPvMePzbz3Mm5Dge/jkrXIgvV1nNhOtm/JqjjOLkj6I3L0kX2p9QCoILVyFFe1DMq kciqh/VHrYqu5wJWI+1Bw== X-UI-Out-Filterresults: notjunk:1;V01:K0:LefTdt39+YI=:UfhHm6jwrgn1IFCUEga8LB uAb6Dv4Z258Jvt9CWkkIx84RjnDN0q/7vYy0epknr72Qbi+2alFW9HZFTMt4+6B8tb4GPFBBT G6uv+9JOmWd6u4XIzel0xBlHp4tOOm8XE8iMor1NaS+iHDp2hf1QCgMY0LYPXhL+Ktvf7N8Ha Uth18mJagBAgnNqdsB31dLXArThQYG8aquLcRkXhCIbgqLY52ZmXXibq+/9kfax1n6BbKovYD jn6Jq69XM55bmInD493jZrX2GVOIaoqKDchLtlQFLED4dUJlGIijCEYzG0iYroVXyjrL+1oEL PuLXEurLG2aKYA5F2+uyI5+Qh52VOLqMEKcOLyBv/fZR5s54emqgucVWW8Zijn6DbFjgoPmns 4BBLCIkBVB2zWCCvIoICStMsY05xAzNejigM4xJV5QxvJRSGENqM8PeE/6rCJl4VPTyspVhmW jYhnNcgEAWQlBOPaj1mKQW/dNOzWWbEZ9cSWSyD4ufgmahIM6bPM5Nop+WHkI22sPPuc3QHzW J+PChD1tCah/dzhKNlTcK+elJaNk1lekaftf6ktyTVIejHQbTj4QpekRBfVg5nDsgdZhK5wNW xHR2GULo3qgDpQmOfVzw9ag1Bu4MokJyqlszwibGg+b9X0BvWmYzTBCBV4dVV71MhY4Y0oiMK 3H+UF7n2kkJa5jIuRPBIuh0TMx6K0LOt5N9LaYQH+dUSE9cmUBSZGSS2G8XfcpjCWBbA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The newly added function triggers a harmless warning: drivers/staging/lustre/lustre/ptlrpc/pack_generic.c: In function 'lustre_shrink_msg': drivers/staging/lustre/lustre/ptlrpc/pack_generic.c:472:1: error: control reaches end of non-void function [-Werror=return-type] This probably happens because LASSERTF() contains an 'unlikely()' that sometimes prevents gcc from analysing the control flow correctly. Adding a return statement here seems harmless and lets us keep that unlikely(). Fixes: 96049bd1ecd0 ("staging: lustre: ptlrpc: embed highest XID in each request") Signed-off-by: Arnd Bergmann --- drivers/staging/lustre/lustre/ptlrpc/pack_generic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c index 13f00b7cbbe5..b1170277fd84 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c +++ b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c @@ -469,6 +469,7 @@ int lustre_shrink_msg(struct lustre_msg *msg, int segment, default: LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); } + return 0; } EXPORT_SYMBOL(lustre_shrink_msg); -- 2.9.0