summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2014-01-30 21:48:51 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-07 21:51:20 +0400
commitde636b389d2eeb06cb91dbffb699e8dcf142910b (patch)
treeebc209f081dbea8563e57bbdcb7e9b35b900728a
parent2eb90a757e9d953c9e2a8fce530422189992fb1b (diff)
downloadlinux-de636b389d2eeb06cb91dbffb699e8dcf142910b.tar.xz
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 <davej@fedoraproject.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lustre/ptlrpc/pack_generic.c10
1 files changed, 1 insertions, 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);