OSDN Git Service

staging: lustre: ptlrpc: avoid warning on missing return
authorArnd Bergmann <arnd@arndb.de>
Wed, 25 Jan 2017 22:36:34 +0000 (23:36 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jan 2017 08:40:56 +0000 (09:40 +0100)
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 <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/ptlrpc/pack_generic.c

index 13f00b7..b117027 100644 (file)
@@ -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);