mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: James Simmons <jsimmons@infradead.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	devel@driverdev.osuosl.org,
	Andreas Dilger <andreas.dilger@intel.com>,
	Oleg Drokin <oleg.drokin@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Lustre Development List <lustre-devel@lists.lustre.org>,
	James Simmons <jsimmons@infradead.org>,
	James Simmons <uja.ornl@yahoo.com>
Subject: [PATCH 08/34] staging: lustre: lnet: change lnet_eq_t to proper structure
Date: Sun, 26 Feb 2017 19:41:33 -0500	[thread overview]
Message-ID: <1488156119-19670-9-git-send-email-jsimmons@infradead.org> (raw)
In-Reply-To: <1488156119-19670-1-git-send-email-jsimmons@infradead.org>

Change lnet_eq_t from typedef to proper structure.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/20831
Reviewed-by: Olaf Weber <olaf@sgi.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
 drivers/staging/lustre/include/linux/lnet/lib-lnet.h  | 14 +++++++-------
 drivers/staging/lustre/include/linux/lnet/lib-types.h |  6 +++---
 drivers/staging/lustre/lnet/lnet/api-ni.c             |  2 +-
 drivers/staging/lustre/lnet/lnet/lib-eq.c             |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
index 1c147b3..9e33d0a 100644
--- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
@@ -178,17 +178,17 @@ static inline int lnet_md_unlinkable(lnet_libmd_t *md)
 
 #define MAX_PORTALS		64
 
-static inline lnet_eq_t *
+static inline struct lnet_eq *
 lnet_eq_alloc(void)
 {
-	lnet_eq_t *eq;
+	struct lnet_eq *eq;
 
 	LIBCFS_ALLOC(eq, sizeof(*eq));
 	return eq;
 }
 
 static inline void
-lnet_eq_free(lnet_eq_t *eq)
+lnet_eq_free(struct lnet_eq *eq)
 {
 	LIBCFS_FREE(eq, sizeof(*eq));
 }
@@ -278,7 +278,7 @@ void lnet_res_lh_initialize(struct lnet_res_container *rec,
 }
 
 static inline void
-lnet_eq2handle(struct lnet_handle_eq *handle, lnet_eq_t *eq)
+lnet_eq2handle(struct lnet_handle_eq *handle, struct lnet_eq *eq)
 {
 	if (!eq) {
 		LNetInvalidateEQHandle(handle);
@@ -288,7 +288,7 @@ void lnet_res_lh_initialize(struct lnet_res_container *rec,
 	handle->cookie = eq->eq_lh.lh_cookie;
 }
 
-static inline lnet_eq_t *
+static inline struct lnet_eq *
 lnet_handle2eq(struct lnet_handle_eq *handle)
 {
 	struct lnet_libhandle *lh;
@@ -297,7 +297,7 @@ void lnet_res_lh_initialize(struct lnet_res_container *rec,
 	if (!lh)
 		return NULL;
 
-	return lh_entry(lh, lnet_eq_t, eq_lh);
+	return lh_entry(lh, struct lnet_eq, eq_lh);
 }
 
 static inline void
@@ -490,7 +490,7 @@ void lnet_msg_attach_md(struct lnet_msg *msg, lnet_libmd_t *md,
 void lnet_msg_commit(struct lnet_msg *msg, int cpt);
 void lnet_msg_decommit(struct lnet_msg *msg, int cpt, int status);
 
-void lnet_eq_enqueue_event(lnet_eq_t *eq, lnet_event_t *ev);
+void lnet_eq_enqueue_event(struct lnet_eq *eq, lnet_event_t *ev);
 void lnet_prep_send(struct lnet_msg *msg, int type, lnet_process_id_t target,
 		    unsigned int offset, unsigned int len);
 int lnet_send(lnet_nid_t nid, struct lnet_msg *msg, lnet_nid_t rtr_nid);
diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h b/drivers/staging/lustre/include/linux/lnet/lib-types.h
index 9f301f4..19e01cc 100644
--- a/drivers/staging/lustre/include/linux/lnet/lib-types.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h
@@ -116,7 +116,7 @@ struct lnet_libhandle {
 #define lh_entry(ptr, type, member) \
 	((type *)((char *)(ptr) - (char *)(&((type *)0)->member)))
 
-typedef struct lnet_eq {
+struct lnet_eq {
 	struct list_head	  eq_list;
 	struct lnet_libhandle	  eq_lh;
 	lnet_seq_t		  eq_enq_seq;
@@ -125,7 +125,7 @@ struct lnet_libhandle {
 	lnet_eq_handler_t	  eq_callback;
 	lnet_event_t		 *eq_events;
 	int			**eq_refs;	/* percpt refcount for EQ */
-} lnet_eq_t;
+};
 
 typedef struct lnet_me {
 	struct list_head	 me_list;
@@ -152,7 +152,7 @@ struct lnet_libhandle {
 	unsigned int		 md_options;
 	unsigned int		 md_flags;
 	void			*md_user_ptr;
-	lnet_eq_t		*md_eq;
+	struct lnet_eq		*md_eq;
 	unsigned int		 md_niov;	/* # frags */
 	union {
 		struct kvec	iov[LNET_MAX_IOV];
diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index 4c9a064..ee47ba9 100644
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -383,7 +383,7 @@ static void lnet_assert_wire_constants(void)
 
 		list_del_init(e);
 		if (rec->rec_type == LNET_COOKIE_TYPE_EQ) {
-			lnet_eq_free(list_entry(e, lnet_eq_t, eq_list));
+			lnet_eq_free(list_entry(e, struct lnet_eq, eq_list));
 
 		} else if (rec->rec_type == LNET_COOKIE_TYPE_MD) {
 			lnet_md_free(list_entry(e, lnet_libmd_t, md_list));
diff --git a/drivers/staging/lustre/lnet/lnet/lib-eq.c b/drivers/staging/lustre/lnet/lnet/lib-eq.c
index 6645fdc..4369df3 100644
--- a/drivers/staging/lustre/lnet/lnet/lib-eq.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-eq.c
@@ -66,7 +66,7 @@
 LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback,
 	    struct lnet_handle_eq *handle)
 {
-	lnet_eq_t *eq;
+	struct lnet_eq *eq;
 
 	LASSERT(the_lnet.ln_refcount > 0);
 
@@ -210,7 +210,7 @@
 EXPORT_SYMBOL(LNetEQFree);
 
 void
-lnet_eq_enqueue_event(lnet_eq_t *eq, lnet_event_t *ev)
+lnet_eq_enqueue_event(struct lnet_eq *eq, lnet_event_t *ev)
 {
 	/* MUST called with resource lock hold but w/o lnet_eq_wait_lock */
 	int index;
@@ -239,7 +239,7 @@
 }
 
 static int
-lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev)
+lnet_eq_dequeue_event(struct lnet_eq *eq, lnet_event_t *ev)
 {
 	int new_index = eq->eq_deq_seq & (eq->eq_size - 1);
 	lnet_event_t *new_event = &eq->eq_events[new_index];
@@ -386,7 +386,7 @@
 
 	for (;;) {
 		for (i = 0; i < neq; i++) {
-			lnet_eq_t *eq = lnet_handle2eq(&eventqs[i]);
+			struct lnet_eq *eq = lnet_handle2eq(&eventqs[i]);
 
 			if (!eq) {
 				lnet_eq_wait_unlock();
-- 
1.8.3.1

  parent reply	other threads:[~2017-02-27  0:52 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-27  0:41 [PATCH 00/34] staging: lustre: lnet: remove most of typedefs from LNet headers James Simmons
2017-02-27  0:41 ` [PATCH 01/34] staging: lustre: socklnd: change UAPI typedefs to proper structure James Simmons
2017-02-27  0:41 ` [PATCH 02/34] staging: lustre: lnet: change lnet_handle_eq_t to proper struct James Simmons
2017-02-27  0:41 ` [PATCH 03/34] staging: lustre: lnet: change lnet_handle_md_t " James Simmons
2017-02-27  0:41 ` [PATCH 04/34] staging: lustre: lnet: change lnet_handle_me_t " James Simmons
2017-02-27  0:41 ` [PATCH 05/34] staging: lustre: lnet: remove generic lnet_handle_any_t James Simmons
2017-02-27  0:41 ` [PATCH 06/34] staging: lustre: lnet: change lnet_msg_t to proper structure James Simmons
2017-02-27  0:41 ` [PATCH 07/34] staging: lustre: lnet: change lnet_libhandle_t " James Simmons
2017-02-27  0:41 ` James Simmons [this message]
2017-02-27  0:41 ` [PATCH 09/34] staging: lustre: lnet: change lnet_me_t " James Simmons
2017-02-27  0:41 ` [PATCH 10/34] staging: lustre: lnet: change lnet_libmd_t " James Simmons
2017-02-27  0:41 ` [PATCH 11/34] staging: lustre: lnet: change lnet_test_peer_t " James Simmons
2017-02-27  0:41 ` [PATCH 12/34] staging: lustre: lnet: change lnd_t " James Simmons
2017-02-27  0:41 ` [PATCH 13/34] staging: lustre: lnet: change lnet_ni_t " James Simmons
2017-02-27  0:41 ` [PATCH 14/34] staging: lustre: lnet: change lnet_rc_data_t " James Simmons
2017-02-27  0:41 ` [PATCH 15/34] staging: lustre: lnet: change lnet_peer_t " James Simmons
2017-02-27  0:41 ` [PATCH 16/34] staging: lustre: lnet: change lnet_route_t " James Simmons
2017-02-27  0:41 ` [PATCH 17/34] staging: lustre: lnet: change lnet_remotenet_t " James Simmons
2017-02-27  0:41 ` [PATCH 18/34] staging: lustre: lnet: change lnet_rtrbufpool_t " James Simmons
2017-02-27  0:41 ` [PATCH 19/34] staging: lustre: lnet: change lnet_rtrbuf_t " James Simmons
2017-02-27  0:41 ` [PATCH 20/34] staging: lustre: lnet: change lnet_portal_t " James Simmons
2017-02-27  0:41 ` [PATCH 21/34] staging: lustre: lnet: change lnet_t " James Simmons
2017-02-27  0:41 ` [PATCH 22/34] staging: lustre: lnet: give LNET_MATCH* enum a name James Simmons
2017-02-27  0:41 ` [PATCH 23/34] staging: lustre: lnet: change lnet_counter_t to proper structure James Simmons
2017-02-27  0:41 ` [PATCH 24/34] staging: lustre: lnet: change lnet_md_t " James Simmons
2017-02-27  0:41 ` [PATCH 25/34] staging: lustre: lnet: change lnet_event_t " James Simmons
2017-02-27  0:41 ` [PATCH 26/34] staging: lustre: lnet: change lnet_process_id_t " James Simmons
2017-02-27  0:41 ` [PATCH 27/34] staging: lustre: lnet: change lnet_msg_type_t to proper enum James Simmons
2017-02-27  0:41 ` [PATCH 28/34] staging: lustre: lnet: change lnet_unlink_t " James Simmons
2017-02-27  0:41 ` [PATCH 29/34] staging: lustre: lnet: change lnet_ins_pos_t " James Simmons
2017-02-27  0:41 ` [PATCH 30/34] staging: lustre: lnet: change lnet_event_kind_t " James Simmons
2017-02-27  0:41 ` [PATCH 31/34] staging: lustre: lnet: change lnet_ack_req_t " James Simmons
2017-02-27  0:41 ` [PATCH 32/34] staging: lustre: lnet: remove LNET_SEQ_BASETYPE James Simmons
2017-02-27  0:41 ` [PATCH 33/34] staging: lustre: lnet: remove unused lnet_md_iovec_t James Simmons
2017-02-27  0:41 ` [PATCH 34/34] staging: lustre: lnet: use struct bio_vec instead of typedef James Simmons

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1488156119-19670-9-git-send-email-jsimmons@infradead.org \
    --to=jsimmons@infradead.org \
    --cc=andreas.dilger@intel.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lustre-devel@lists.lustre.org \
    --cc=oleg.drokin@intel.com \
    --cc=uja.ornl@yahoo.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®