/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
*
- * Copyright (C) 2004 Cluster File Systems, Inc.
- * Author: Eric Barton <eric@bartonsoftware.com>
- * Author: Frank Zago <fzago@systemfabricworks.com>
+ * GPL HEADER START
*
- * This file is part of Lustre, http://www.lustre.org.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Lustre is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
*
- * Lustre is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
*
- * You should have received a copy of the GNU General Public License
- * along with Lustre; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * 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
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lnet/klnds/viblnd/viblnd_cb.c
+ *
+ * Author: Eric Barton <eric@bartonsoftware.com>
+ * Author: Frank Zago <fzago@systemfabricworks.com>
*/
#include "viblnd.h"
LASSERT (conn->ibc_state >= IBNAL_CONN_INIT);
LASSERT (rx->rx_nob >= 0); /* not posted */
- CDEBUG(D_NET, "posting rx [%d %x "LPX64"]\n",
+ CDEBUG(D_NET, "posting rx [%d %x "LPX64"]\n",
rx->rx_wrq.scatgat_list->length,
rx->rx_wrq.scatgat_list->l_key,
KIBNAL_SG2ADDR(rx->rx_wrq.scatgat_list->v_address));
spin_unlock(&conn->ibc_lock);
- CERROR ("post rx -> %s failed %d\n",
+ CERROR ("post rx -> %s failed %d\n",
libcfs_nid2str(conn->ibc_peer->ibp_nid), vvrc);
rc = -EIO;
- kibnal_close_conn(rx->rx_conn, rc);
+ kibnal_close_conn(conn, rc);
/* No more posts for this rx; so lose its ref */
kibnal_conn_decref(conn);
return rc;
rx->rx_nob = nob; /* Can trust 'nob' now */
- if (!lnet_ptlcompat_matchnid(conn->ibc_peer->ibp_nid,
- msg->ibm_srcnid) ||
- !lnet_ptlcompat_matchnid(kibnal_data.kib_ni->ni_nid,
- msg->ibm_dstnid) ||
+ if (conn->ibc_peer->ibp_nid != msg->ibm_srcnid ||
+ kibnal_data.kib_ni->ni_nid != msg->ibm_dstnid ||
msg->ibm_srcstamp != conn->ibc_incarnation ||
msg->ibm_dststamp != kibnal_data.kib_incarnation) {
CERROR ("Stale rx from %s\n",
case IBNAL_MSG_PUT_REQ:
if (mlen == 0) {
lnet_finalize(ni, lntmsg, 0);
- kibnal_send_completion(rx->rx_conn, IBNAL_MSG_PUT_NAK, 0,
+ kibnal_send_completion(conn, IBNAL_MSG_PUT_NAK, 0,
rxmsg->ibm_u.putreq.ibprm_cookie);
break;
}
libcfs_nid2str(conn->ibc_peer->ibp_nid), rc);
kibnal_tx_done(tx);
/* tell peer it's over */
- kibnal_send_completion(rx->rx_conn, IBNAL_MSG_PUT_NAK, rc,
+ kibnal_send_completion(conn, IBNAL_MSG_PUT_NAK, rc,
rxmsg->ibm_u.putreq.ibprm_cookie);
break;
}
kibnal_reply(ni, rx, lntmsg);
} else {
/* GET didn't match anything */
- kibnal_send_completion(rx->rx_conn, IBNAL_MSG_GET_DONE,
- -ENODATA,
+ kibnal_send_completion(conn, IBNAL_MSG_GET_DONE, -ENODATA,
rxmsg->ibm_u.get.ibgm_cookie);
}
break;
goto reject;
}
- if (!lnet_ptlcompat_matchnid(kibnal_data.kib_ni->ni_nid,
- rxmsg.ibm_dstnid)) {
+ if (kibnal_data.kib_ni->ni_nid != rxmsg.ibm_dstnid) {
CERROR("Can't accept %s: bad dst nid %s\n",
libcfs_nid2str(rxmsg.ibm_srcnid),
libcfs_nid2str(rxmsg.ibm_dstnid));
write_unlock_irqrestore(g_lock, flags);
CWARN("Conn race %s\n",
- libcfs_nid2str(peer2->ibp_nid));
+ libcfs_nid2str(rxmsg.ibm_srcnid));
kibnal_peer_decref(peer);
reason = IBNAL_REJECT_CONN_RACE;
if (conn != NULL) {
LASSERT (rc != 0);
kibnal_connreq_done(conn, 0, rc);
+ kibnal_conn_decref(conn);
} else {
cm_destroy_cep(cep);
}
}
read_lock_irqsave(&kibnal_data.kib_global_lock, flags);
- if (lnet_ptlcompat_matchnid(kibnal_data.kib_ni->ni_nid,
- msg.ibm_dstnid) &&
+ if (kibnal_data.kib_ni->ni_nid == msg.ibm_dstnid &&
msg.ibm_dststamp == kibnal_data.kib_incarnation)
rc = 0;
else
path->pkey, &cv->cv_pkey_index);
if (vvrc != vv_return_ok) {
CWARN("pkey2pkey_index failed for %s @ %u.%u.%u.%u: %d\n",
- libcfs_nid2str(peer->ibp_nid),
+ libcfs_nid2str(peer->ibp_nid),
HIPQUAD(peer->ibp_ip), vvrc);
goto failed;
}
&path->slid);
if (vvrc != vv_return_ok) {
CWARN("port_num2base_lid failed for %s @ %u.%u.%u.%u: %d\n",
- libcfs_nid2str(peer->ibp_ip),
+ libcfs_nid2str(peer->ibp_ip),
HIPQUAD(peer->ibp_ip), vvrc);
goto failed;
}
spin_unlock_irqrestore(&kibnal_data.kib_sched_lock,
flags);
- our_cond_resched();
+ cfs_cond_resched();
busy_loops = 0;
spin_lock_irqsave(&kibnal_data.kib_sched_lock, flags);