Commit 74e3bb75 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman

staging: lustre: ptlrpc: avoid warning on missing return

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: 96049bd1 ("staging: lustre: ptlrpc: embed highest XID in each request")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f3147b66
...@@ -469,6 +469,7 @@ int lustre_shrink_msg(struct lustre_msg *msg, int segment, ...@@ -469,6 +469,7 @@ int lustre_shrink_msg(struct lustre_msg *msg, int segment,
default: default:
LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic); LASSERTF(0, "incorrect message magic: %08x\n", msg->lm_magic);
} }
return 0;
} }
EXPORT_SYMBOL(lustre_shrink_msg); EXPORT_SYMBOL(lustre_shrink_msg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment