Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0f5aad5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: remove LPU64 define 



Just use the proper modifier type...

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f537dd2c

drivers/staging/lustre/include/linux/libcfs/linux/kp30.h

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ 


/* this is a bit chunky */



# define LPU64 "%llu"

# define LPX64 "%#llx"



#endif

drivers/staging/lustre/include/linux/lnet/ptllnd.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#ifdef _USING_LUSTRE_PORTALS_



/* NIDs are 64-bits on Lustre Portals */

#define FMT_NID LPU64

#define FMT_NID "%llu"

#define FMT_PID "%d"



/* When using Lustre Portals Lustre completion semantics are imlicit*/

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

+1 −1
Original line number Diff line number Diff line
@@ -2517,7 +2517,7 @@ ksocknal_debug_peerhash (lnet_ni_t *ni) 
		ksock_conn_t  *conn;



		CWARN ("Active peer on shutdown: %s, ref %d, scnt %d, "

		       "closing %d, accepting %d, err %d, zcookie "LPU64", "

		       "closing %d, accepting %d, err %d, zcookie %llu, "

		       "txq %d, zc_req %d\n", libcfs_id2str(peer->ksnp_id),

		       atomic_read(&peer->ksnp_refcount),

		       peer->ksnp_sharecount, peer->ksnp_closing,

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

+1 −1
Original line number Diff line number Diff line
@@ -1199,7 +1199,7 @@ ksocknal_process_receive (ksock_conn_t *conn) 
					       conn->ksnc_msg.ksm_zc_cookies[1]);



			if (rc != 0) {

				CERROR("%s: Unknown ZC-ACK cookie: "LPU64", "LPU64"\n",

				CERROR("%s: Unknown ZC-ACK cookie: %llu, %llu\n",

				       libcfs_id2str(conn->ksnc_peer->ksnp_id),

				       cookie, conn->ksnc_msg.ksm_zc_cookies[1]);

				ksocknal_new_packet(conn, 0);

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

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ ksocknal_queue_tx_zcack_v3(ksock_conn_t *conn, 


	if (cookie == tx->tx_msg.ksm_zc_cookies[0] ||

	    cookie == tx->tx_msg.ksm_zc_cookies[1]) {

		CWARN("%s: duplicated ZC cookie: "LPU64"\n",

		CWARN("%s: duplicated ZC cookie: %llu\n",

		      libcfs_id2str(conn->ksnc_peer->ksnp_id), cookie);

		return 1; /* XXX return error in the future */

	}
@@ -244,7 +244,7 @@ ksocknal_queue_tx_zcack_v3(ksock_conn_t *conn, 
		/* ksm_zc_cookies[0] < ksm_zc_cookies[1], it is range of cookies */

		if (cookie >= tx->tx_msg.ksm_zc_cookies[0] &&

		    cookie <= tx->tx_msg.ksm_zc_cookies[1]) {

			CWARN("%s: duplicated ZC cookie: "LPU64"\n",

			CWARN("%s: duplicated ZC cookie: %llu\n",

			      libcfs_id2str(conn->ksnc_peer->ksnp_id), cookie);

			return 1; /* XXX: return error in the future */

		}