Commit 91a39e29 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman

staging: lustre: lnet: change lnet_rtrbufpool_t to proper structure

Change lnet_rtrbufpool_t from typedef to proper structure.
Signed-off-by: default avatarJames Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/20831Reviewed-by: default avatarOlaf Weber <olaf@sgi.com>
Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 37c324c6
...@@ -496,7 +496,7 @@ void lnet_prep_send(struct lnet_msg *msg, int type, lnet_process_id_t target, ...@@ -496,7 +496,7 @@ void lnet_prep_send(struct lnet_msg *msg, int type, lnet_process_id_t target,
int lnet_send(lnet_nid_t nid, struct lnet_msg *msg, lnet_nid_t rtr_nid); int lnet_send(lnet_nid_t nid, struct lnet_msg *msg, lnet_nid_t rtr_nid);
void lnet_return_tx_credits_locked(struct lnet_msg *msg); void lnet_return_tx_credits_locked(struct lnet_msg *msg);
void lnet_return_rx_credits_locked(struct lnet_msg *msg); void lnet_return_rx_credits_locked(struct lnet_msg *msg);
void lnet_schedule_blocked_locked(lnet_rtrbufpool_t *rbp); void lnet_schedule_blocked_locked(struct lnet_rtrbufpool *rbp);
void lnet_drop_routed_msgs_locked(struct list_head *list, int cpt); void lnet_drop_routed_msgs_locked(struct list_head *list, int cpt);
/* portals functions */ /* portals functions */
......
...@@ -396,7 +396,7 @@ struct lnet_remotenet { ...@@ -396,7 +396,7 @@ struct lnet_remotenet {
/** lnet message is waiting for credit */ /** lnet message is waiting for credit */
#define LNET_CREDIT_WAIT 1 #define LNET_CREDIT_WAIT 1
typedef struct { struct lnet_rtrbufpool {
struct list_head rbp_bufs; /* my free buffer pool */ struct list_head rbp_bufs; /* my free buffer pool */
struct list_head rbp_msgs; /* messages blocking struct list_head rbp_msgs; /* messages blocking
for a buffer */ for a buffer */
...@@ -408,11 +408,11 @@ typedef struct { ...@@ -408,11 +408,11 @@ typedef struct {
int rbp_credits; /* # free buffers / int rbp_credits; /* # free buffers /
blocked messages */ blocked messages */
int rbp_mincredits; /* low water mark */ int rbp_mincredits; /* low water mark */
} lnet_rtrbufpool_t; };
typedef struct { typedef struct {
struct list_head rb_list; /* chain on rbp_bufs */ struct list_head rb_list; /* chain on rbp_bufs */
lnet_rtrbufpool_t *rb_pool; /* owning pool */ struct lnet_rtrbufpool *rb_pool; /* owning pool */
lnet_kiov_t rb_kiov[0]; /* the buffer space */ lnet_kiov_t rb_kiov[0]; /* the buffer space */
} lnet_rtrbuf_t; } lnet_rtrbuf_t;
...@@ -596,7 +596,7 @@ typedef struct { ...@@ -596,7 +596,7 @@ typedef struct {
/* validity stamp */ /* validity stamp */
__u64 ln_routers_version; __u64 ln_routers_version;
/* percpt router buffer pools */ /* percpt router buffer pools */
lnet_rtrbufpool_t **ln_rtrpools; struct lnet_rtrbufpool **ln_rtrpools;
struct lnet_handle_md ln_ping_target_md; struct lnet_handle_md ln_ping_target_md;
struct lnet_handle_eq ln_ping_target_eq; struct lnet_handle_eq ln_ping_target_eq;
......
...@@ -680,10 +680,10 @@ lnet_post_send_locked(struct lnet_msg *msg, int do_send) ...@@ -680,10 +680,10 @@ lnet_post_send_locked(struct lnet_msg *msg, int do_send)
return LNET_CREDIT_OK; return LNET_CREDIT_OK;
} }
static lnet_rtrbufpool_t * static struct lnet_rtrbufpool *
lnet_msg2bufpool(struct lnet_msg *msg) lnet_msg2bufpool(struct lnet_msg *msg)
{ {
lnet_rtrbufpool_t *rbp; struct lnet_rtrbufpool *rbp;
int cpt; int cpt;
LASSERT(msg->msg_rx_committed); LASSERT(msg->msg_rx_committed);
...@@ -710,7 +710,7 @@ lnet_post_routed_recv_locked(struct lnet_msg *msg, int do_recv) ...@@ -710,7 +710,7 @@ lnet_post_routed_recv_locked(struct lnet_msg *msg, int do_recv)
* received or OK to receive * received or OK to receive
*/ */
struct lnet_peer *lp = msg->msg_rxpeer; struct lnet_peer *lp = msg->msg_rxpeer;
lnet_rtrbufpool_t *rbp; struct lnet_rtrbufpool *rbp;
lnet_rtrbuf_t *rb; lnet_rtrbuf_t *rb;
LASSERT(!msg->msg_iov); LASSERT(!msg->msg_iov);
...@@ -835,7 +835,7 @@ lnet_return_tx_credits_locked(struct lnet_msg *msg) ...@@ -835,7 +835,7 @@ lnet_return_tx_credits_locked(struct lnet_msg *msg)
} }
void void
lnet_schedule_blocked_locked(lnet_rtrbufpool_t *rbp) lnet_schedule_blocked_locked(struct lnet_rtrbufpool *rbp)
{ {
struct lnet_msg *msg; struct lnet_msg *msg;
...@@ -880,7 +880,7 @@ lnet_return_rx_credits_locked(struct lnet_msg *msg) ...@@ -880,7 +880,7 @@ lnet_return_rx_credits_locked(struct lnet_msg *msg)
if (msg->msg_rtrcredit) { if (msg->msg_rtrcredit) {
/* give back global router credits */ /* give back global router credits */
lnet_rtrbuf_t *rb; lnet_rtrbuf_t *rb;
lnet_rtrbufpool_t *rbp; struct lnet_rtrbufpool *rbp;
/* /*
* NB If a msg ever blocks for a buffer in rbp_msgs, it stays * NB If a msg ever blocks for a buffer in rbp_msgs, it stays
......
...@@ -558,7 +558,7 @@ int lnet_get_rtr_pool_cfg(int idx, struct lnet_ioctl_pool_cfg *pool_cfg) ...@@ -558,7 +558,7 @@ int lnet_get_rtr_pool_cfg(int idx, struct lnet_ioctl_pool_cfg *pool_cfg)
return rc; return rc;
for (i = 0; i < LNET_NRBPOOLS; i++) { for (i = 0; i < LNET_NRBPOOLS; i++) {
lnet_rtrbufpool_t *rbp; struct lnet_rtrbufpool *rbp;
lnet_net_lock(LNET_LOCK_EX); lnet_net_lock(LNET_LOCK_EX);
cfs_percpt_for_each(rbp, j, the_lnet.ln_rtrpools) { cfs_percpt_for_each(rbp, j, the_lnet.ln_rtrpools) {
...@@ -1316,7 +1316,7 @@ lnet_destroy_rtrbuf(lnet_rtrbuf_t *rb, int npages) ...@@ -1316,7 +1316,7 @@ lnet_destroy_rtrbuf(lnet_rtrbuf_t *rb, int npages)
} }
static lnet_rtrbuf_t * static lnet_rtrbuf_t *
lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp, int cpt) lnet_new_rtrbuf(struct lnet_rtrbufpool *rbp, int cpt)
{ {
int npages = rbp->rbp_npages; int npages = rbp->rbp_npages;
int sz = offsetof(lnet_rtrbuf_t, rb_kiov[npages]); int sz = offsetof(lnet_rtrbuf_t, rb_kiov[npages]);
...@@ -1351,7 +1351,7 @@ lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp, int cpt) ...@@ -1351,7 +1351,7 @@ lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp, int cpt)
} }
static void static void
lnet_rtrpool_free_bufs(lnet_rtrbufpool_t *rbp, int cpt) lnet_rtrpool_free_bufs(struct lnet_rtrbufpool *rbp, int cpt)
{ {
int npages = rbp->rbp_npages; int npages = rbp->rbp_npages;
struct list_head tmp; struct list_head tmp;
...@@ -1380,7 +1380,7 @@ lnet_rtrpool_free_bufs(lnet_rtrbufpool_t *rbp, int cpt) ...@@ -1380,7 +1380,7 @@ lnet_rtrpool_free_bufs(lnet_rtrbufpool_t *rbp, int cpt)
} }
static int static int
lnet_rtrpool_adjust_bufs(lnet_rtrbufpool_t *rbp, int nbufs, int cpt) lnet_rtrpool_adjust_bufs(struct lnet_rtrbufpool *rbp, int nbufs, int cpt)
{ {
struct list_head rb_list; struct list_head rb_list;
lnet_rtrbuf_t *rb; lnet_rtrbuf_t *rb;
...@@ -1467,7 +1467,7 @@ lnet_rtrpool_adjust_bufs(lnet_rtrbufpool_t *rbp, int nbufs, int cpt) ...@@ -1467,7 +1467,7 @@ lnet_rtrpool_adjust_bufs(lnet_rtrbufpool_t *rbp, int nbufs, int cpt)
} }
static void static void
lnet_rtrpool_init(lnet_rtrbufpool_t *rbp, int npages) lnet_rtrpool_init(struct lnet_rtrbufpool *rbp, int npages)
{ {
INIT_LIST_HEAD(&rbp->rbp_msgs); INIT_LIST_HEAD(&rbp->rbp_msgs);
INIT_LIST_HEAD(&rbp->rbp_bufs); INIT_LIST_HEAD(&rbp->rbp_bufs);
...@@ -1480,7 +1480,7 @@ lnet_rtrpool_init(lnet_rtrbufpool_t *rbp, int npages) ...@@ -1480,7 +1480,7 @@ lnet_rtrpool_init(lnet_rtrbufpool_t *rbp, int npages)
void void
lnet_rtrpools_free(int keep_pools) lnet_rtrpools_free(int keep_pools)
{ {
lnet_rtrbufpool_t *rtrp; struct lnet_rtrbufpool *rtrp;
int i; int i;
if (!the_lnet.ln_rtrpools) /* uninitialized or freed */ if (!the_lnet.ln_rtrpools) /* uninitialized or freed */
...@@ -1558,7 +1558,7 @@ lnet_nrb_large_calculate(void) ...@@ -1558,7 +1558,7 @@ lnet_nrb_large_calculate(void)
int int
lnet_rtrpools_alloc(int im_a_router) lnet_rtrpools_alloc(int im_a_router)
{ {
lnet_rtrbufpool_t *rtrp; struct lnet_rtrbufpool *rtrp;
int nrb_tiny; int nrb_tiny;
int nrb_small; int nrb_small;
int nrb_large; int nrb_large;
...@@ -1593,7 +1593,7 @@ lnet_rtrpools_alloc(int im_a_router) ...@@ -1593,7 +1593,7 @@ lnet_rtrpools_alloc(int im_a_router)
the_lnet.ln_rtrpools = cfs_percpt_alloc(lnet_cpt_table(), the_lnet.ln_rtrpools = cfs_percpt_alloc(lnet_cpt_table(),
LNET_NRBPOOLS * LNET_NRBPOOLS *
sizeof(lnet_rtrbufpool_t)); sizeof(struct lnet_rtrbufpool));
if (!the_lnet.ln_rtrpools) { if (!the_lnet.ln_rtrpools) {
LCONSOLE_ERROR_MSG(0x10c, LCONSOLE_ERROR_MSG(0x10c,
"Failed to initialize router buffe pool\n"); "Failed to initialize router buffe pool\n");
...@@ -1639,7 +1639,7 @@ lnet_rtrpools_adjust_helper(int tiny, int small, int large) ...@@ -1639,7 +1639,7 @@ lnet_rtrpools_adjust_helper(int tiny, int small, int large)
int nrb = 0; int nrb = 0;
int rc = 0; int rc = 0;
int i; int i;
lnet_rtrbufpool_t *rtrp; struct lnet_rtrbufpool *rtrp;
/* /*
* If the provided values for each buffer pool are different than the * If the provided values for each buffer pool are different than the
......
...@@ -592,7 +592,7 @@ static int __proc_lnet_buffers(void *data, int write, ...@@ -592,7 +592,7 @@ static int __proc_lnet_buffers(void *data, int write,
goto out; /* I'm not a router */ goto out; /* I'm not a router */
for (idx = 0; idx < LNET_NRBPOOLS; idx++) { for (idx = 0; idx < LNET_NRBPOOLS; idx++) {
lnet_rtrbufpool_t *rbp; struct lnet_rtrbufpool *rbp;
lnet_net_lock(LNET_LOCK_EX); lnet_net_lock(LNET_LOCK_EX);
cfs_percpt_for_each(rbp, i, the_lnet.ln_rtrpools) { cfs_percpt_for_each(rbp, i, the_lnet.ln_rtrpools) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment