* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
CFS_MODULE_PARM(routes, "s", charp, 0444,
"routes to non-local networks");
-static char *portals_compatibility = "none";
-CFS_MODULE_PARM(portals_compatibility, "s", charp, 0444,
- "wire protocol compatibility: 'strong'|'weak'|'none'");
-
char *
lnet_get_routes(void)
{
return "tcp";
}
-int
-lnet_get_portals_compatibility(void)
-{
- if (!strcmp(portals_compatibility, "none")) {
- return 0;
- }
-
- if (!strcmp(portals_compatibility, "weak")) {
- return 1;
- LCONSOLE_WARN("Starting in weak portals-compatible mode\n");
- }
-
- if (!strcmp(portals_compatibility, "strong")) {
- return 2;
- LCONSOLE_WARN("Starting in strong portals-compatible mode\n");
- }
-
- LCONSOLE_ERROR_MSG(0x102, "portals_compatibility=\"%s\" not supported\n",
- portals_compatibility);
- return -EINVAL;
-}
-
void
lnet_init_locks(void)
{
return default_networks;
}
-int
-lnet_get_portals_compatibility(void)
-{
- return 0;
-}
-
# ifndef HAVE_LIBPTHREAD
void lnet_init_locks(void)
list_for_each (tmp, &the_lnet.ln_lnds) {
lnd = list_entry(tmp, lnd_t, lnd_list);
- if (lnd->lnd_type == type)
+ if ((int)lnd->lnd_type == type)
return lnd;
}
LASSERT (count == fl->fl_nobjs);
LIBCFS_FREE(fl->fl_objs, fl->fl_nobjs * fl->fl_objsize);
- memset (fl, 0, sizeof (fl));
+ memset (fl, 0, sizeof (*fl));
}
int
#ifdef __KERNEL__
int i;
- the_lnet.ln_nfinalizers = num_online_cpus();
+ the_lnet.ln_nfinalizers = (int) num_online_cpus();
LIBCFS_ALLOC(the_lnet.ln_finalizers,
the_lnet.ln_nfinalizers *
lnet_libmd_t, md_list);
CERROR ("Active md %p on exit\n", md);
- list_del (&md->md_list);
+ list_del_init (&md->md_list);
lnet_md_free (md);
}
list_for_each (tmp, &the_lnet.ln_nis) {
ni = list_entry(tmp, lnet_ni_t, ni_list);
- if (lnet_ptlcompat_matchnet(LNET_NIDNET(ni->ni_nid), net)) {
+ if (LNET_NIDNET(ni->ni_nid) == net) {
lnet_ni_addref_locked(ni);
return ni;
}
list_for_each (tmp, &the_lnet.ln_nis) {
ni = list_entry(tmp, lnet_ni_t, ni_list);
- if (lnet_ptlcompat_matchnid(ni->ni_nid, nid)) {
+ if (ni->ni_nid == nid) {
lnet_ni_addref_locked(ni);
return ni;
}
}
int
-lnet_count_acceptor_nis (lnet_ni_t **first_ni)
+lnet_count_acceptor_nis (void)
{
- /* Return the # of NIs that need the acceptor. Return the first one in
- * *first_ni so the acceptor can pass it connections "blind" to retain
- * binary compatibility. */
+ /* Return the # of NIs that need the acceptor. */
int count = 0;
#if defined(__KERNEL__) || defined(HAVE_LIBPTHREAD)
struct list_head *tmp;
list_for_each (tmp, &the_lnet.ln_nis) {
ni = list_entry(tmp, lnet_ni_t, ni_list);
- if (ni->ni_lnd->lnd_accept != NULL) {
- /* This LND uses the acceptor */
- if (count == 0 && first_ni != NULL) {
- lnet_ni_addref_locked(ni);
- *first_ni = ni;
- }
+ if (ni->ni_lnd->lnd_accept != NULL)
count++;
- }
}
LNET_UNLOCK();
goto failed;
}
+ LASSERT (ni->ni_peertimeout <= 0 || lnd->lnd_query != NULL);
+
list_del(&ni->ni_list);
LNET_LOCK();
ni->ni_txcredits = ni->ni_mintxcredits = ni->ni_maxtxcredits;
- CDEBUG(D_LNI, "Added LNI %s [%d/%d]\n",
+ CDEBUG(D_LNI, "Added LNI %s [%d/%d/%d/%d]\n",
libcfs_nid2str(ni->ni_nid),
- ni->ni_peertxcredits, ni->ni_txcredits);
-
- /* Handle nidstrings for network 0 just like this one */
- if (the_lnet.ln_ptlcompat > 0) {
- if (nicount > 0) {
- LCONSOLE_ERROR_MSG(0x108, "Can't run > 1 "
- "network when portals_compatibility is "
- "set\n");
- goto failed;
- }
- libcfs_setnet0alias(lnd->lnd_type);
- }
+ ni->ni_peertxcredits, ni->ni_txcredits,
+ ni->ni_peerrtrcredits, ni->ni_peertimeout);
nicount++;
}
int
LNetInit(void)
{
- int rc;
-
lnet_assert_wire_constants ();
LASSERT (!the_lnet.ln_init);
memset(&the_lnet, 0, sizeof(the_lnet));
- rc = lnet_get_portals_compatibility();
- if (rc < 0)
- return rc;
-
lnet_init_locks();
CFS_INIT_LIST_HEAD(&the_lnet.ln_lnds);
- the_lnet.ln_ptlcompat = rc;
the_lnet.ln_refcount = 0;
the_lnet.ln_init = 1;
goto out;
}
+ lnet_get_tunables();
+
if (requested_pid == LNET_PID_ANY) {
/* Don't instantiate LNET just for me */
rc = -ENETDOWN;
LNetCtl(unsigned int cmd, void *arg)
{
struct libcfs_ioctl_data *data = arg;
- lnet_process_id_t id;
+ lnet_process_id_t id = {0};
lnet_ni_t *ni;
int rc;
(time_t)data->ioc_u64[0]);
case IOC_LIBCFS_PORTALS_COMPATIBILITY:
- return the_lnet.ln_ptlcompat;
+ /* This can be removed once lustre stops calling it */
+ return 0;
case IOC_LIBCFS_LNET_DIST:
rc = LNetDist(data->ioc_nid, &data->ioc_nid, &data->ioc_u32[1]);
return 0;
case IOC_LIBCFS_PING:
- rc = lnet_ping((lnet_process_id_t) {.nid = data->ioc_nid,
- .pid = data->ioc_u32[0]},
- data->ioc_u32[1], /* timeout */
+ id.nid = data->ioc_nid;
+ id.pid = data->ioc_u32[0];
+ rc = lnet_ping(id, data->ioc_u32[1], /* timeout */
(lnet_process_id_t *)data->ioc_pbuf1,
data->ioc_plen1/sizeof(lnet_process_id_t));
if (rc < 0)
case IOC_LIBCFS_DEBUG_PEER: {
/* CAVEAT EMPTOR: this one designed for calling directly; not
* via an ioctl */
- lnet_process_id_t *id = arg;
+ id = *((lnet_process_id_t *) arg);
- lnet_debug_peer(id->nid);
+ lnet_debug_peer(id.nid);
- ni = lnet_net2ni(LNET_NIDNET(id->nid));
+ ni = lnet_net2ni(LNET_NIDNET(id.nid));
if (ni == NULL) {
- CDEBUG(D_WARNING, "No NI for %s\n", libcfs_id2str(*id));
+ CDEBUG(D_WARNING, "No NI for %s\n", libcfs_id2str(id));
} else {
if (ni->ni_lnd->lnd_ctl == NULL) {
CDEBUG(D_WARNING, "No ctl for %s\n",
- libcfs_id2str(*id));
+ libcfs_id2str(id));
} else {
(void)ni->ni_lnd->lnd_ctl(ni, cmd, arg);
}
{
lnet_handle_me_t meh;
lnet_process_id_t id;
+ lnet_md_t md = {0};
int rc;
int rc2;
int n;
- int infosz;
+ unsigned int infosz;
int i;
for (n = 0; ; n++) {
goto failed_0;
}
- rc = LNetMEAttach(LNET_RESERVED_PORTAL,
- (lnet_process_id_t){.nid = LNET_NID_ANY,
- .pid = LNET_PID_ANY},
- LNET_PROTO_PING_MATCHBITS, 0LL,
+ memset(&id, 0, sizeof(lnet_process_id_t));
+ id.nid = LNET_NID_ANY;
+ id.pid = LNET_PID_ANY;
+
+ rc = LNetMEAttach(LNET_RESERVED_PORTAL, id,
+ LNET_PROTO_PING_MATCHBITS, 0,
LNET_UNLINK, LNET_INS_AFTER,
&meh);
if (rc != 0) {
goto failed_1;
}
- rc = LNetMDAttach(meh,
- (lnet_md_t){.start = the_lnet.ln_ping_info,
- .length = infosz,
- .threshold = LNET_MD_THRESH_INF,
- .options = (LNET_MD_OP_GET |
- LNET_MD_TRUNCATE |
- LNET_MD_MANAGE_REMOTE),
- .eq_handle = the_lnet.ln_ping_target_eq},
+ /* initialize md content */
+ md.start = the_lnet.ln_ping_info;
+ md.length = infosz;
+ md.threshold = LNET_MD_THRESH_INF;
+ md.max_size = 0;
+ md.options = LNET_MD_OP_GET | LNET_MD_TRUNCATE |
+ LNET_MD_MANAGE_REMOTE;
+ md.user_ptr = NULL;
+ md.eq_handle = the_lnet.ln_ping_target_eq;
+
+ rc = LNetMDAttach(meh, md,
LNET_RETAIN,
&the_lnet.ln_ping_target_md);
if (rc != 0) {
lnet_handle_eq_t eqh;
lnet_handle_md_t mdh;
lnet_event_t event;
+ lnet_md_t md = {0};
int which;
int unlinked = 0;
int replied = 0;
goto out_0;
}
- rc = LNetMDBind((lnet_md_t){.start = info,
- .length = infosz,
- .threshold = 2, /* GET/REPLY */
- .options = LNET_MD_TRUNCATE,
- .eq_handle = eqh},
- LNET_UNLINK,
- &mdh);
+ /* initialize md content */
+ md.start = info;
+ md.length = infosz;
+ md.threshold = 2; /*GET/REPLY*/
+ md.max_size = 0;
+ md.options = LNET_MD_TRUNCATE;
+ md.user_ptr = NULL;
+ md.eq_handle = eqh;
+
+ rc = LNetMDBind(md, LNET_UNLINK, &mdh);
if (rc != 0) {
CERROR("Can't bind MD: %d\n", rc);
goto out_1;
__swab32s(&info->pi_version);
__swab32s(&info->pi_pid);
__swab32s(&info->pi_nnids);
- for (i = 0; i < info->pi_nnids && i < n_ids; i++)
+ for (i = 0; i < (int)info->pi_nnids && i < (int)n_ids; i++)
__swab64s(&info->pi_nid[i]);
} else if (info->pi_magic != LNET_PROTO_PING_MAGIC) {
goto out_1;
}
- if (nob < offsetof(lnet_ping_info_t, pi_nid[0])) {
+ if (nob < (int)offsetof(lnet_ping_info_t, pi_nid[0])) {
CERROR("%s: Short reply %d(%d min)\n", libcfs_id2str(id),
nob, (int)offsetof(lnet_ping_info_t, pi_nid[0]));
goto out_1;
}
- if (info->pi_nnids < n_ids)
+ if ((int) info->pi_nnids < n_ids)
n_ids = info->pi_nnids;
- if (nob < offsetof(lnet_ping_info_t, pi_nid[n_ids])) {
+ if (nob < (int)offsetof(lnet_ping_info_t, pi_nid[n_ids])) {
CERROR("%s: Short reply %d(%d expected)\n", libcfs_id2str(id),
nob, (int)offsetof(lnet_ping_info_t, pi_nid[n_ids]));
goto out_1;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff