From de636b389d2eeb06cb91dbffb699e8dcf142910b Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Thu, 30 Jan 2014 12:48:51 -0500 Subject: [PATCH] staging: lustre: remove unnecessary 'magic' from lustre_pack_request This probably made more sense when the code supported multiple protocol versions, but now it's just obfuscation. Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/ptlrpc/pack_generic.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c index 464479c0f00b..c319f74b04f6 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c +++ b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c @@ -244,15 +244,7 @@ int lustre_pack_request(struct ptlrpc_request *req, __u32 magic, int count, LASSERT(lens[MSG_PTLRPC_BODY_OFF] == sizeof(struct ptlrpc_body)); /* only use new format, we don't need to be compatible with 1.4 */ - magic = LUSTRE_MSG_MAGIC_V2; - - switch (magic) { - case LUSTRE_MSG_MAGIC_V2: - return lustre_pack_request_v2(req, count, lens, bufs); - default: - LASSERTF(0, "incorrect message magic: %08x\n", magic); - return -EINVAL; - } + return lustre_pack_request_v2(req, count, lens, bufs); } EXPORT_SYMBOL(lustre_pack_request); -- 2.20.1