staging: lustre: Fix typo in lustre/lnet (2b284326) · Commits · 戴 / test

drivers/staging/lustre/include/linux/lnet/lib-types.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -619,7 +619,7 @@ typedef struct lnet_portal {
		unsigned int ptl_index; /* portal ID, reserved */
		/* flags on this portal: lazy, unique... */
		unsigned int ptl_options;
		/* list of messags which are stealing buffer */
		/* list of messages which are stealing buffer */
		struct list_head ptl_msg_stealing;
		/* messages blocking for MD */
		struct list_head ptl_msg_delayed;

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1441,7 +1441,7 @@ ksocknal_close_conn_locked (ksock_conn_t *conn, int error)

		conn->ksnc_route = NULL;

		#if 0 /* irrelevent with only eager routes */
		#if 0 /* irrelevant with only eager routes */
		/* make route least favourite */
		list_del (&route->ksnr_list);
		list_add_tail (&route->ksnr_list, &peer->ksnp_routes);
		@@ -1496,7 +1496,7 @@ ksocknal_peer_failed (ksock_peer_t *peer)

		/* There has been a connection failure or comms error; but I'll only
		* tell LNET I think the peer is dead if it's to another kernel and
		* there are no connections or connection attempts in existance. */
		* there are no connections or connection attempts in existence. */

		read_lock(&ksocknal_data.ksnd_global_lock);

		@@ -2358,7 +2358,7 @@ ksocknal_new_incarnation (void)
		/* The incarnation number is the time this module loaded and it
		* identifies this particular instance of the socknal. Hopefully
		* we won't be able to reboot more frequently than 1MHz for the
		* forseeable future :) */
		* foreseeable future :) */

		do_gettimeofday(&tv);

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1116,7 +1116,7 @@ ksocknal_process_receive (ksock_conn_t *conn)
		LASSERT (atomic_read(&conn->ksnc_conn_refcount) > 0);

		/* NB: sched lock NOT held */
		/* SOCKNAL_RX_LNET_HEADER is here for backward compatability */
		/* SOCKNAL_RX_LNET_HEADER is here for backward compatibility */
		LASSERT (conn->ksnc_rx_state == SOCKNAL_RX_KSM_HEADER \|\|
		conn->ksnc_rx_state == SOCKNAL_RX_LNET_PAYLOAD \|\|
		conn->ksnc_rx_state == SOCKNAL_RX_LNET_HEADER \|\|
		@@ -1985,7 +1985,7 @@ ksocknal_connect (ksock_route_t *route)
		list_splice_init(&peer->ksnp_tx_queue, &zombies);
		}

		#if 0 /* irrelevent with only eager routes */
		#if 0 /* irrelevant with only eager routes */
		if (!route->ksnr_deleted) {
		/* make this route least-favourite for re-selection */
		list_del(&route->ksnr_list);

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,7 @@ ksocknal_queue_tx_zcack_v3(ksock_conn_t *conn,
		if (tx->tx_msg.ksm_zc_cookies[0] > tx->tx_msg.ksm_zc_cookies[1]) {
		__u64 tmp = 0;

		/* two seperated cookies: (a+2, a) or (a+1, a) */
		/* two separated cookies: (a+2, a) or (a+1, a) */
		LASSERT (tx->tx_msg.ksm_zc_cookies[0] -
		tx->tx_msg.ksm_zc_cookies[1] <= 2);

drivers/staging/lustre/lnet/lnet/lib-msg.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -316,7 +316,7 @@ lnet_msg_attach_md(lnet_msg_t msg, lnet_libmd_t md,
		LASSERT(!msg->msg_routing);

		msg->msg_md = md;
		if (msg->msg_receiving) { /* commited for receiving */
		if (msg->msg_receiving) { /* committed for receiving */
		msg->msg_offset = offset;
		msg->msg_wanted = mlen;
		}
		@@ -392,7 +392,7 @@ lnet_complete_msg_locked(lnet_msg_t *msg, int cpt)
		* NB: message is committed for sending, we should return
		* on success because LND will finalize this message later.
		*
		* Also, there is possibility that message is commited for
		* Also, there is possibility that message is committed for
		* sending and also failed before delivering to LND,
		* i.e: ENOMEM, in that case we can't fall through either
		* because CPT for sending can be different with CPT for
		@@ -414,7 +414,7 @@ lnet_complete_msg_locked(lnet_msg_t *msg, int cpt)
		* NB: message is committed for sending, we should return
		* on success because LND will finalize this message later.
		*
		* Also, there is possibility that message is commited for
		* Also, there is possibility that message is committed for
		* sending and also failed before delivering to LND,
		* i.e: ENOMEM, in that case we can't fall through either:
		* - The rule is message must decommit for sending first if
		@@ -474,14 +474,14 @@ lnet_finalize (lnet_ni_t ni, lnet_msg_t msg, int status)
		again:
		rc = 0;
		if (!msg->msg_tx_committed && !msg->msg_rx_committed) {
		/* not commited to network yet */
		/* not committed to network yet */
		LASSERT(!msg->msg_onactivelist);
		lnet_msg_free(msg);
		return;
		}

		/*
		* NB: routed message can be commited for both receiving and sending,
		* NB: routed message can be committed for both receiving and sending,
		* we should finalize in LIFO order and keep counters correct.
		* (finalize sending first then finalize receiving)
		*/

Admin message