From c2c2a39b4f373c721a56016b07b514a3e82dd6ac Mon Sep 17 00:00:00 2001 From: James Simmons Date: Sun, 26 Feb 2017 19:41:57 -0500 Subject: [PATCH] staging: lustre: lnet: remove LNET_SEQ_BASETYPE The lnet_seq_t is a simple unsigned long so lets simplify it. Signed-off-by: James Simmons Reviewed-on: https://review.whamcloud.com/20831 Reviewed-by: Olaf Weber Reviewed-by: Doug Oucharek Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin Signed-off-by: James Simmons Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/include/linux/lnet/lib-types.h | 4 ++-- drivers/staging/lustre/include/linux/lnet/types.h | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h b/drivers/staging/lustre/include/linux/lnet/lib-types.h index b9f1bd2c919f..69c11c154d8d 100644 --- a/drivers/staging/lustre/include/linux/lnet/lib-types.h +++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h @@ -119,8 +119,8 @@ struct lnet_libhandle { struct lnet_eq { struct list_head eq_list; struct lnet_libhandle eq_lh; - lnet_seq_t eq_enq_seq; - lnet_seq_t eq_deq_seq; + unsigned long eq_enq_seq; + unsigned long eq_deq_seq; unsigned int eq_size; lnet_eq_handler_t eq_callback; struct lnet_event *eq_events; diff --git a/drivers/staging/lustre/include/linux/lnet/types.h b/drivers/staging/lustre/include/linux/lnet/types.h index 8e10ad666e4d..7d394965d279 100644 --- a/drivers/staging/lustre/include/linux/lnet/types.h +++ b/drivers/staging/lustre/include/linux/lnet/types.h @@ -561,9 +561,7 @@ enum lnet_event_kind { LNET_EVENT_UNLINK, }; -#define LNET_SEQ_BASETYPE long -typedef unsigned LNET_SEQ_BASETYPE lnet_seq_t; -#define LNET_SEQ_GT(a, b) (((signed LNET_SEQ_BASETYPE)((a) - (b))) > 0) +#define LNET_SEQ_GT(a, b) (((signed long)((a) - (b))) > 0) /** * Information about an event on a MD. @@ -634,7 +632,7 @@ struct lnet_event { * The sequence number for this event. Sequence numbers are unique * to each event. */ - volatile lnet_seq_t sequence; + volatile unsigned long sequence; }; /** -- 2.20.1