X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Frouter_proc.c;h=edbc0ec4e4551c5a75391f8363c1a68fa4dd05f7;hp=cb190044564d051b2355c00551d182d352dbefe7;hb=5655ee76f5c7573c9ad076a92df6388f27b65196;hpb=44f30fd7b54bbb7fa218214f18e5c3dc3e4b1171 diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c index cb19004..edbc0ec 100644 --- a/lnet/lnet/router_proc.c +++ b/lnet/lnet/router_proc.c @@ -32,28 +32,6 @@ static struct ctl_table_header *lnet_table_header = NULL; -#ifndef HAVE_SYSCTL_UNNUMBERED -#define CTL_LNET (0x100) -enum { - PSDEV_LNET_STATS = 100, - PSDEV_LNET_ROUTES, - PSDEV_LNET_ROUTERS, - PSDEV_LNET_PEERS, - PSDEV_LNET_BUFFERS, - PSDEV_LNET_NIS, - PSDEV_LNET_PTL_ROTOR, -}; -#else -#define CTL_LNET CTL_UNNUMBERED -#define PSDEV_LNET_STATS CTL_UNNUMBERED -#define PSDEV_LNET_ROUTES CTL_UNNUMBERED -#define PSDEV_LNET_ROUTERS CTL_UNNUMBERED -#define PSDEV_LNET_PEERS CTL_UNNUMBERED -#define PSDEV_LNET_BUFFERS CTL_UNNUMBERED -#define PSDEV_LNET_NIS CTL_UNNUMBERED -#define PSDEV_LNET_PTL_ROTOR CTL_UNNUMBERED -#endif - #define LNET_LOFFT_BITS (sizeof(loff_t) * 8) /* * NB: max allowed LNET_CPT_BITS is 8 on 64-bit system and 2 on 32-bit system @@ -150,9 +128,17 @@ static int __proc_lnet_stats(void *data, int write, return rc; } -DECLARE_PROC_HANDLER(proc_lnet_stats); +static int +proc_lnet_stats(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) +{ + return lprocfs_call_handler(table->data, write, ppos, buffer, lenp, + __proc_lnet_stats); +} -int LL_PROC_PROTO(proc_lnet_routes) +static int +proc_lnet_routes(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) { const int tmpsiz = 256; char *tmpstr; @@ -192,12 +178,12 @@ int LL_PROC_PROTO(proc_lnet_routes) lnet_net_unlock(0); *ppos = LNET_PROC_POS_MAKE(0, ver, 0, off); } else { - cfs_list_t *n; - cfs_list_t *r; + struct list_head *n; + struct list_head *r; lnet_route_t *route = NULL; lnet_remotenet_t *rnet = NULL; int skip = off - 1; - cfs_list_t *rn_list; + struct list_head *rn_list; int i; lnet_net_lock(0); @@ -215,15 +201,15 @@ int LL_PROC_PROTO(proc_lnet_routes) n = rn_list->next; while (n != rn_list && route == NULL) { - rnet = cfs_list_entry(n, lnet_remotenet_t, - lrn_list); + rnet = list_entry(n, lnet_remotenet_t, + lrn_list); r = rnet->lrn_routes.next; while (r != &rnet->lrn_routes) { lnet_route_t *re = - cfs_list_entry(r, lnet_route_t, - lr_list); + list_entry(r, lnet_route_t, + lr_list); if (skip == 0) { route = re; break; @@ -242,7 +228,7 @@ int LL_PROC_PROTO(proc_lnet_routes) unsigned int hops = route->lr_hops; unsigned int priority = route->lr_priority; lnet_nid_t nid = route->lr_gateway->lp_nid; - int alive = route->lr_gateway->lp_alive; + int alive = lnet_is_route_alive(route); s += snprintf(s, tmpstr + tmpsiz - s, "%-8s %4u %8u %7s %s\n", @@ -277,7 +263,9 @@ int LL_PROC_PROTO(proc_lnet_routes) return rc; } -int LL_PROC_PROTO(proc_lnet_routers) +static int +proc_lnet_routers(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) { int rc = 0; char *tmpstr; @@ -314,9 +302,9 @@ int LL_PROC_PROTO(proc_lnet_routers) lnet_net_unlock(0); *ppos = LNET_PROC_POS_MAKE(0, ver, 0, off); } else { - cfs_list_t *r; - struct lnet_peer *peer = NULL; - int skip = off - 1; + struct list_head *r; + struct lnet_peer *peer = NULL; + int skip = off - 1; lnet_net_lock(0); @@ -329,9 +317,9 @@ int LL_PROC_PROTO(proc_lnet_routers) r = the_lnet.ln_routers.next; - while (r != &the_lnet.ln_routers) { - lnet_peer_t *lp = cfs_list_entry(r, lnet_peer_t, - lp_rtr_list); + while (r != &the_lnet.ln_routers) { + lnet_peer_t *lp = list_entry(r, lnet_peer_t, + lp_rtr_list); if (skip == 0) { peer = lp; @@ -358,8 +346,8 @@ int LL_PROC_PROTO(proc_lnet_routers) if ((peer->lp_ping_feats & LNET_PING_FEAT_NI_STATUS) != 0) { - cfs_list_for_each_entry(rtr, &peer->lp_routes, - lr_gwlist) { + list_for_each_entry(rtr, &peer->lp_routes, + lr_gwlist) { /* downis on any route should be the * number of downis on the gateway */ if (rtr->lr_downis != 0) { @@ -411,7 +399,9 @@ int LL_PROC_PROTO(proc_lnet_routers) return rc; } -int LL_PROC_PROTO(proc_lnet_peers) +static int +proc_lnet_peers(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) { const int tmpsiz = 256; struct lnet_peer_table *ptable; @@ -451,7 +441,7 @@ int LL_PROC_PROTO(proc_lnet_peers) hoff++; } else { struct lnet_peer *peer; - cfs_list_t *p; + struct list_head *p; int skip; again: p = NULL; @@ -474,8 +464,8 @@ int LL_PROC_PROTO(proc_lnet_peers) p = ptable->pt_hash[hash].next; while (p != &ptable->pt_hash[hash]) { - lnet_peer_t *lp = cfs_list_entry(p, lnet_peer_t, - lp_hashlist); + lnet_peer_t *lp = list_entry(p, lnet_peer_t, + lp_hashlist); if (skip == 0) { peer = lp; @@ -635,9 +625,17 @@ static int __proc_lnet_buffers(void *data, int write, return rc; } -DECLARE_PROC_HANDLER(proc_lnet_buffers); +static int +proc_lnet_buffers(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) +{ + return lprocfs_call_handler(table->data, write, ppos, buffer, lenp, + __proc_lnet_buffers); +} -int LL_PROC_PROTO(proc_lnet_nis) +static int +proc_lnet_nis(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) { int tmpsiz = 128 * LNET_CPT_NUMBER; int rc = 0; @@ -663,7 +661,7 @@ int LL_PROC_PROTO(proc_lnet_nis) "rtr", "max", "tx", "min"); LASSERT (tmpstr + tmpsiz - s > 0); } else { - cfs_list_t *n; + struct list_head *n; lnet_ni_t *ni = NULL; int skip = *ppos - 1; @@ -671,8 +669,8 @@ int LL_PROC_PROTO(proc_lnet_nis) n = the_lnet.ln_nis.next; - while (n != &the_lnet.ln_nis) { - lnet_ni_t *a_ni = cfs_list_entry(n, lnet_ni_t, ni_list); + while (n != &the_lnet.ln_nis) { + lnet_ni_t *a_ni = list_entry(n, lnet_ni_t, ni_list); if (skip == 0) { ni = a_ni; @@ -854,72 +852,76 @@ out: LIBCFS_FREE(buf, buf_len); return rc; } -DECLARE_PROC_HANDLER(proc_lnet_portal_rotor); + +static int +proc_lnet_portal_rotor(struct ctl_table *table, int write, void __user *buffer, + size_t *lenp, loff_t *ppos) +{ + return lprocfs_call_handler(table->data, write, ppos, buffer, lenp, + __proc_lnet_portal_rotor); +} + static struct ctl_table lnet_table[] = { - /* - * NB No .strategy entries have been provided since sysctl(8) prefers - * to go via /proc for portability. - */ - { - INIT_CTL_NAME(PSDEV_LNET_STATS) - .procname = "stats", - .mode = 0644, - .proc_handler = &proc_lnet_stats, - }, - { - INIT_CTL_NAME(PSDEV_LNET_ROUTES) - .procname = "routes", - .mode = 0444, - .proc_handler = &proc_lnet_routes, - }, - { - INIT_CTL_NAME(PSDEV_LNET_ROUTERS) - .procname = "routers", - .mode = 0444, - .proc_handler = &proc_lnet_routers, - }, - { - INIT_CTL_NAME(PSDEV_LNET_PEERS) - .procname = "peers", - .mode = 0444, - .proc_handler = &proc_lnet_peers, - }, - { - INIT_CTL_NAME(PSDEV_LNET_PEERS) - .procname = "buffers", - .mode = 0444, - .proc_handler = &proc_lnet_buffers, - }, - { - INIT_CTL_NAME(PSDEV_LNET_NIS) - .procname = "nis", - .mode = 0444, - .proc_handler = &proc_lnet_nis, - }, - { - INIT_CTL_NAME(PSDEV_LNET_PTL_ROTOR) - .procname = "portal_rotor", - .mode = 0644, - .proc_handler = &proc_lnet_portal_rotor, + /* + * NB No .strategy entries have been provided since sysctl(8) prefers + * to go via /proc for portability. + */ + { + INIT_CTL_NAME + .procname = "stats", + .mode = 0644, + .proc_handler = &proc_lnet_stats, }, { - INIT_CTL_NAME(0) - } + INIT_CTL_NAME + .procname = "routes", + .mode = 0444, + .proc_handler = &proc_lnet_routes, + }, + { + INIT_CTL_NAME + .procname = "routers", + .mode = 0444, + .proc_handler = &proc_lnet_routers, + }, + { + INIT_CTL_NAME + .procname = "peers", + .mode = 0444, + .proc_handler = &proc_lnet_peers, + }, + { + INIT_CTL_NAME + .procname = "buffers", + .mode = 0444, + .proc_handler = &proc_lnet_buffers, + }, + { + INIT_CTL_NAME + .procname = "nis", + .mode = 0444, + .proc_handler = &proc_lnet_nis, + }, + { + INIT_CTL_NAME + .procname = "portal_rotor", + .mode = 0644, + .proc_handler = &proc_lnet_portal_rotor, + }, + { 0 } }; static struct ctl_table top_table[] = { - { - INIT_CTL_NAME(CTL_LNET) - .procname = "lnet", - .mode = 0555, - .data = NULL, - .maxlen = 0, - .child = lnet_table, - }, - { - INIT_CTL_NAME(0) - } + { + INIT_CTL_NAME + .procname = "lnet", + .mode = 0555, + .data = NULL, + .maxlen = 0, + .child = lnet_table, + }, + { 0 } }; void