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

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

staging: lustre: remove LPD64 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 f7941e4d

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

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ 
/* this is a bit chunky */



# define LPU64 "%llu"

# define LPD64 "%lld"

# define LPX64 "%#llx"



#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -1289,7 +1289,7 @@ ksocknal_create_conn (lnet_ni_t *ni, ksock_route_t *route, 
	 */



	CDEBUG(D_NET, "New conn %s p %d.x %pI4h -> %pI4h/%d"

	       " incarnation:"LPD64" sched[%d:%d]\n",

	       " incarnation:%lld sched[%d:%d]\n",

	       libcfs_id2str(peerid), conn->ksnc_proto->pro_version,

	       &conn->ksnc_myipaddr, &conn->ksnc_ipaddr,

	       conn->ksnc_port, incarnation, cpt,

drivers/staging/lustre/lnet/selftest/rpc.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ srpc_post_active_rdma(int portal, __u64 matchbits, void *buf, int len, 
	}



	if (rc != 0) {

		CERROR ("LNet%s(%s, %d, "LPD64") failed: %d\n",

		CERROR ("LNet%s(%s, %d, %lld) failed: %d\n",

			((options & LNET_MD_OP_PUT) != 0) ? "Put" : "Get",

			libcfs_id2str(peer), portal, matchbits, rc);

drivers/staging/lustre/lustre/lov/lov_pack.c

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ int lov_setea(struct obd_export *exp, struct lov_stripe_md **lsmp, 
			return rc;

		if (ostid_id(&lmm_objects[i].l_ost_oi) > last_id) {

			CERROR("Setting EA for object > than last id on"

			       " ost idx %d "DOSTID" > "LPD64" \n",

			       " ost idx %d "DOSTID" > %lld \n",

			       lmm_objects[i].l_ost_idx,

			       POSTID(&lmm_objects[i].l_ost_oi), last_id);

			return -EINVAL;

drivers/staging/lustre/lustre/mgc/mgc_request.c

+2 −2
Original line number Diff line number Diff line
@@ -1457,7 +1457,7 @@ static int mgc_apply_recover_logs(struct obd_device *mgc, 
			break;

		}



		CDEBUG(D_INFO, "ir apply logs "LPD64"/"LPD64" for %s -> %s\n",

		CDEBUG(D_INFO, "ir apply logs %lld/%lld for %s -> %s\n",

		       prev_version, max_version, obdname, params);



		rc = class_process_config(lcfg);
@@ -1560,7 +1560,7 @@ static int mgc_process_recover_log(struct obd_device *obd, 
	cfg->cfg_last_idx = res->mcr_offset;

	eof = res->mcr_offset == res->mcr_size;



	CDEBUG(D_INFO, "Latest version "LPD64", more %d.\n",

	CDEBUG(D_INFO, "Latest version %lld, more %d.\n",

	       res->mcr_offset, eof == false);



	ealen = sptlrpc_cli_unwrap_bulk_read(req, req->rq_bulk, 0);