staging/lustre/ptlrpc: get rid of lustre 1.8 compatible checksums

[firefly-linux-kernel-4.4.55.git] / drivers / staging / lustre / lustre / ptlrpc / sec_null.c

diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_null.c b/drivers/staging/lustre/lustre/ptlrpc/sec_null.c
index 099cec3b669ff068467e07ce68aff2bbfac4cb25..4e132435b450787543f804b17412cb9a779e02bf 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_null.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_null.c
@@ -101,16 +101,7 @@ int null_ctx_verify(struct ptlrpc_cli_ctx *ctx, struct ptlrpc_request *req)
 
        if (req->rq_early) {
                cksums = lustre_msg_get_cksum(req->rq_repdata);
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0)
-               if (lustre_msghdr_get_flags(req->rq_reqmsg) &
-                   MSGHDR_CKSUM_INCOMPAT18)
-                       cksumc = lustre_msg_calc_cksum(req->rq_repmsg, 0);
-               else
-                       cksumc = lustre_msg_calc_cksum(req->rq_repmsg, 1);
-#else
-# warning "remove checksum compatibility support for b1_8"
                cksumc = lustre_msg_calc_cksum(req->rq_repmsg);
-#endif
                if (cksumc != cksums) {
                        CDEBUG(D_SEC,
                               "early reply checksum mismatch: %08x != %08x\n",
@@ -371,16 +362,7 @@ int null_authorize(struct ptlrpc_request *req)
        } else {
                __u32 cksum;
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 7, 50, 0)
-               if (lustre_msghdr_get_flags(req->rq_reqmsg) &
-                   MSGHDR_CKSUM_INCOMPAT18)
-                       cksum = lustre_msg_calc_cksum(rs->rs_repbuf, 0);
-               else
-                       cksum = lustre_msg_calc_cksum(rs->rs_repbuf, 1);
-#else
-# warning "remove checksum compatibility support for b1_8"
                cksum = lustre_msg_calc_cksum(rs->rs_repbuf);
-#endif
                lustre_msg_set_cksum(rs->rs_repbuf, cksum);
                req->rq_reply_off = 0;
        }