From: James Simmons Date: Mon, 27 Feb 2017 00:41:56 +0000 (-0500) Subject: staging: lustre: lnet: change lnet_ack_req_t to proper enum X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8942bc2bca3884100725414b36d7741de029dbdd;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git staging: lustre: lnet: change lnet_ack_req_t to proper enum Change lnet_ack_req_t from typedef to proper enum. 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 --- diff --git a/drivers/staging/lustre/include/linux/lnet/api.h b/drivers/staging/lustre/include/linux/lnet/api.h index fc428985ea07..f4b6de2ec0ff 100644 --- a/drivers/staging/lustre/include/linux/lnet/api.h +++ b/drivers/staging/lustre/include/linux/lnet/api.h @@ -180,7 +180,7 @@ int LNetEQPoll(struct lnet_handle_eq *eventqs_in, */ int LNetPut(lnet_nid_t self, struct lnet_handle_md md_in, - lnet_ack_req_t ack_req_in, + enum lnet_ack_req ack_req_in, struct lnet_process_id target_in, unsigned int portal_in, __u64 match_bits_in, diff --git a/drivers/staging/lustre/include/linux/lnet/types.h b/drivers/staging/lustre/include/linux/lnet/types.h index a621ab636ac7..8e10ad666e4d 100644 --- a/drivers/staging/lustre/include/linux/lnet/types.h +++ b/drivers/staging/lustre/include/linux/lnet/types.h @@ -663,12 +663,12 @@ typedef void (*lnet_eq_handler_t)(struct lnet_event *event); * \see lnet_md::options for the discussion on LNET_MD_ACK_DISABLE by which * acknowledgments can be disabled for a MD. */ -typedef enum { +enum lnet_ack_req { /** Request an acknowledgment */ LNET_ACK_REQ, /** Request that no acknowledgment should be generated. */ LNET_NOACK_REQ -} lnet_ack_req_t; +}; /** @} lnet_data */ /** @} lnet */ diff --git a/drivers/staging/lustre/lnet/lnet/lib-move.c b/drivers/staging/lustre/lnet/lnet/lib-move.c index 7fdbc751cb8b..48e1f5b271bf 100644 --- a/drivers/staging/lustre/lnet/lnet/lib-move.c +++ b/drivers/staging/lustre/lnet/lnet/lib-move.c @@ -1990,7 +1990,7 @@ lnet_recv_delayed_msg_list(struct list_head *head) * \see lnet_event::hdr_data and lnet_event_kind. */ int -LNetPut(lnet_nid_t self, struct lnet_handle_md mdh, lnet_ack_req_t ack, +LNetPut(lnet_nid_t self, struct lnet_handle_md mdh, enum lnet_ack_req ack, struct lnet_process_id target, unsigned int portal, __u64 match_bits, unsigned int offset, __u64 hdr_data) diff --git a/drivers/staging/lustre/lustre/ptlrpc/niobuf.c b/drivers/staging/lustre/lustre/ptlrpc/niobuf.c index e3d2c0dc3b00..eddc1927a8d2 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/niobuf.c +++ b/drivers/staging/lustre/lustre/ptlrpc/niobuf.c @@ -44,7 +44,7 @@ * Returns 0 on success or error code. */ static int ptl_send_buf(struct lnet_handle_md *mdh, void *base, int len, - lnet_ack_req_t ack, struct ptlrpc_cb_id *cbid, + enum lnet_ack_req ack, struct ptlrpc_cb_id *cbid, struct ptlrpc_connection *conn, int portal, __u64 xid, unsigned int offset) {