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 07/34] staging: lustre: lnet: change lnet_libhandle_t to proper structure
Date: Sun, 26 Feb 2017 19:41:32 -0500 [thread overview]
Message-ID: <1488156119-19670-8-git-send-email-jsimmons@infradead.org> (raw)
In-Reply-To: <1488156119-19670-1-git-send-email-jsimmons@infradead.org>
Change lnet_libhandle_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 | 16 ++++++++--------
drivers/staging/lustre/include/linux/lnet/lib-types.h | 10 +++++-----
drivers/staging/lustre/lnet/lnet/api-ni.c | 7 ++++---
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
index e894990..1c147b3 100644
--- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
@@ -266,12 +266,12 @@ static inline int lnet_md_unlinkable(lnet_libmd_t *md)
LIBCFS_FREE(msg, sizeof(*msg));
}
-lnet_libhandle_t *lnet_res_lh_lookup(struct lnet_res_container *rec,
- __u64 cookie);
+struct lnet_libhandle *lnet_res_lh_lookup(struct lnet_res_container *rec,
+ __u64 cookie);
void lnet_res_lh_initialize(struct lnet_res_container *rec,
- lnet_libhandle_t *lh);
+ struct lnet_libhandle *lh);
static inline void
-lnet_res_lh_invalidate(lnet_libhandle_t *lh)
+lnet_res_lh_invalidate(struct lnet_libhandle *lh)
{
/* NB: cookie is still useful, don't reset it */
list_del(&lh->lh_hash_chain);
@@ -291,7 +291,7 @@ void lnet_res_lh_initialize(struct lnet_res_container *rec,
static inline lnet_eq_t *
lnet_handle2eq(struct lnet_handle_eq *handle)
{
- lnet_libhandle_t *lh;
+ struct lnet_libhandle *lh;
lh = lnet_res_lh_lookup(&the_lnet.ln_eq_container, handle->cookie);
if (!lh)
@@ -310,7 +310,7 @@ void lnet_res_lh_initialize(struct lnet_res_container *rec,
lnet_handle2md(struct lnet_handle_md *handle)
{
/* ALWAYS called with resource lock held */
- lnet_libhandle_t *lh;
+ struct lnet_libhandle *lh;
int cpt;
cpt = lnet_cpt_of_cookie(handle->cookie);
@@ -326,7 +326,7 @@ void lnet_res_lh_initialize(struct lnet_res_container *rec,
lnet_wire_handle2md(struct lnet_handle_wire *wh)
{
/* ALWAYS called with resource lock held */
- lnet_libhandle_t *lh;
+ struct lnet_libhandle *lh;
int cpt;
if (wh->wh_interface_cookie != the_lnet.ln_interface_cookie)
@@ -351,7 +351,7 @@ void lnet_res_lh_initialize(struct lnet_res_container *rec,
lnet_handle2me(struct lnet_handle_me *handle)
{
/* ALWAYS called with resource lock held */
- lnet_libhandle_t *lh;
+ struct lnet_libhandle *lh;
int cpt;
cpt = lnet_cpt_of_cookie(handle->cookie);
diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h b/drivers/staging/lustre/include/linux/lnet/lib-types.h
index e3cb795..9f301f4 100644
--- a/drivers/staging/lustre/include/linux/lnet/lib-types.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h
@@ -108,17 +108,17 @@ struct lnet_msg {
struct lnet_hdr msg_hdr;
};
-typedef struct lnet_libhandle {
+struct lnet_libhandle {
struct list_head lh_hash_chain;
__u64 lh_cookie;
-} lnet_libhandle_t;
+};
#define lh_entry(ptr, type, member) \
((type *)((char *)(ptr) - (char *)(&((type *)0)->member)))
typedef struct lnet_eq {
struct list_head eq_list;
- lnet_libhandle_t eq_lh;
+ struct lnet_libhandle eq_lh;
lnet_seq_t eq_enq_seq;
lnet_seq_t eq_deq_seq;
unsigned int eq_size;
@@ -129,7 +129,7 @@ struct lnet_msg {
typedef struct lnet_me {
struct list_head me_list;
- lnet_libhandle_t me_lh;
+ struct lnet_libhandle me_lh;
lnet_process_id_t me_match_id;
unsigned int me_portal;
unsigned int me_pos; /* hash offset in mt_hash */
@@ -141,7 +141,7 @@ struct lnet_msg {
typedef struct lnet_libmd {
struct list_head md_list;
- lnet_libhandle_t md_lh;
+ struct lnet_libhandle md_lh;
lnet_me_t *md_me;
char *md_start;
unsigned int md_offset;
diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index 5161b8a..4c9a064 100644
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -483,12 +483,12 @@ static void lnet_assert_wire_constants(void)
return recs;
}
-lnet_libhandle_t *
+struct lnet_libhandle *
lnet_res_lh_lookup(struct lnet_res_container *rec, __u64 cookie)
{
/* ALWAYS called with lnet_res_lock held */
struct list_head *head;
- lnet_libhandle_t *lh;
+ struct lnet_libhandle *lh;
unsigned int hash;
if ((cookie & LNET_COOKIE_MASK) != rec->rec_type)
@@ -506,7 +506,8 @@ static void lnet_assert_wire_constants(void)
}
void
-lnet_res_lh_initialize(struct lnet_res_container *rec, lnet_libhandle_t *lh)
+lnet_res_lh_initialize(struct lnet_res_container *rec,
+ struct lnet_libhandle *lh)
{
/* ALWAYS called with lnet_res_lock held */
unsigned int ibits = LNET_COOKIE_TYPE_BITS + LNET_CPT_BITS;
--
1.8.3.1
next prev parent reply other threads:[~2017-02-27 0:51 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 ` James Simmons [this message]
2017-02-27 0:41 ` [PATCH 08/34] staging: lustre: lnet: change lnet_eq_t " James Simmons
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-8-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®