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

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

staging: lustre: remove LPX64 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 b0f5aad5

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

+0 −4
Original line number Diff line number Diff line
@@ -68,8 +68,4 @@ 


#include "portals_compat25.h"



/* this is a bit chunky */



# define LPX64 "%#llx"



#endif

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

+7 −9
Original line number Diff line number Diff line
@@ -959,7 +959,7 @@ kiblnd_close_stale_conns_locked (kib_peer_t *peer, 
			continue;



		CDEBUG(D_NET, "Closing stale conn -> %s version: %x, "

			      "incarnation:"LPX64"(%x, "LPX64")\n",

			      "incarnation:%#llx(%x, %#llx)\n",

		       libcfs_nid2str(peer->ibp_nid),

		       conn->ibc_version, conn->ibc_incarnation,

		       version, incarnation);
@@ -1202,7 +1202,7 @@ kiblnd_map_rx_descs(kib_conn_t *conn) 
						   rx->rx_msgaddr));

		KIBLND_UNMAP_ADDR_SET(rx, rx_msgunmap, rx->rx_msgaddr);



		CDEBUG(D_NET,"rx %d: %p "LPX64"("LPX64")\n",

		CDEBUG(D_NET,"rx %d: %p %#llx(%#llx)\n",

		       i, rx->rx_msg, rx->rx_msgaddr,

		       lnet_page2phys(pg) + pg_off);
@@ -2336,7 +2336,7 @@ kiblnd_hdev_get_attr(kib_hca_dev_t *hdev) 
			return 0;

	}



	CERROR("Invalid mr size: "LPX64"\n", hdev->ibh_mr_size);

	CERROR("Invalid mr size: %#llx\n", hdev->ibh_mr_size);

	return -EINVAL;

}
@@ -2418,8 +2418,8 @@ kiblnd_hdev_setup_mrs(kib_hca_dev_t *hdev) 


	if (hdev->ibh_mr_shift < 32 || hdev->ibh_nmrs > 1024) {

		/* it's 4T..., assume we will re-code at that time */

		CERROR("Can't support memory size: x"LPX64

		       " with MR size: x"LPX64"\n", mm_size, mr_size);

		CERROR("Can't support memory size: x%#llx with MR size: x%#llx\n",

		       mm_size, mr_size);

		return -EINVAL;

	}
@@ -2440,8 +2440,7 @@ kiblnd_hdev_setup_mrs(kib_hca_dev_t *hdev) 


		mr = ib_reg_phys_mr(hdev->ibh_pd, &ipb, 1, acflags, &iova);

		if (IS_ERR(mr)) {

			CERROR("Failed ib_reg_phys_mr addr "LPX64

			       " size "LPX64" : %ld\n",

			CERROR("Failed ib_reg_phys_mr addr %#llx size %#llx : %ld\n",

			       ipb.addr, ipb.size, PTR_ERR(mr));

			kiblnd_hdev_cleanup_mrs(hdev);

			return PTR_ERR(mr);
@@ -2454,8 +2453,7 @@ kiblnd_hdev_setup_mrs(kib_hca_dev_t *hdev) 


out:

	if (hdev->ibh_mr_size != ~0ULL || hdev->ibh_nmrs != 1)

		LCONSOLE_INFO("Register global MR array, MR size: "

			      LPX64", array size: %d\n",

		LCONSOLE_INFO("Register global MR array, MR size: %#llx, array size: %d\n",

			      hdev->ibh_mr_size, hdev->ibh_nmrs);

	return 0;

}

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

+2 −3
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ kiblnd_handle_completion(kib_conn_t *conn, int txtype, int status, __u64 cookie) 
	if (tx == NULL) {

		spin_unlock(&conn->ibc_lock);



		CWARN("Unmatched completion type %x cookie "LPX64" from %s\n",

		CWARN("Unmatched completion type %x cookie %#llx from %s\n",

		      txtype, cookie, libcfs_nid2str(conn->ibc_peer->ibp_nid));

		kiblnd_close_conn(conn, -EPROTO);

		return;
@@ -1005,8 +1005,7 @@ kiblnd_tx_complete (kib_tx_t *tx, int status) 


	if (failed) {

		if (conn->ibc_state == IBLND_CONN_ESTABLISHED)

			CNETERR("Tx -> %s cookie "LPX64

				" sending %d waiting %d: failed %d\n",

			CNETERR("Tx -> %s cookie %#llx sending %d waiting %d: failed %d\n",

				libcfs_nid2str(conn->ibc_peer->ibp_nid),

				tx->tx_cookie, tx->tx_sending, tx->tx_waiting,

				status);

drivers/staging/lustre/lnet/lnet/api-ni.c

+1 −1
Original line number Diff line number Diff line
@@ -1575,7 +1575,7 @@ EXPORT_SYMBOL(LNetGetId); 
void

LNetSnprintHandle(char *str, int len, lnet_handle_any_t h)

{

	snprintf(str, len, LPX64, h.cookie);

	snprintf(str, len, "%#llx", h.cookie);

}

EXPORT_SYMBOL(LNetSnprintHandle);

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

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ lnet_me_unlink(lnet_me_t *me) 
static void

lib_me_dump(lnet_me_t *me)

{

	CWARN("Match Entry %p ("LPX64")\n", me,

	CWARN("Match Entry %p (%#llx)\n", me,

	      me->me_lh.lh_cookie);



	CWARN("\tMatch/Ignore\t= %016lx / %016lx\n",