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

Commit 57adf7ee authored by Ryusuke Konishi's avatar Ryusuke Konishi Committed by Steven Whitehouse
Browse files

[DLM] fix format warnings in rcom.c and recoverd.c 



This fixes the following gcc warnings generated on
the architectures where uint64_t != unsigned long long (e.g. ppc64).

fs/dlm/rcom.c:154: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'uint64_t'
fs/dlm/rcom.c:154: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'uint64_t'
fs/dlm/recoverd.c:48: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'uint64_t'
fs/dlm/recoverd.c:202: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'uint64_t'
fs/dlm/recoverd.c:210: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'uint64_t'

Signed-off-by: default avatarRyusuke Konishi <ryusuke@osrg.net>
Signed-off-by: default avatarPatrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 0ac23069

fs/dlm/rcom.c

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ static void receive_sync_reply(struct dlm_ls *ls, struct dlm_rcom *rc_in) 
	    rc_in->rc_id != ls->ls_rcom_seq) {

		log_debug(ls, "reject reply %d from %d seq %llx expect %llx",

			  rc_in->rc_type, rc_in->rc_header.h_nodeid,

			  rc_in->rc_id, ls->ls_rcom_seq);

			  (unsigned long long)rc_in->rc_id,

			  (unsigned long long)ls->ls_rcom_seq);

		goto out;

	}

	memcpy(ls->ls_recover_buf, rc_in, rc_in->rc_header.h_length);

fs/dlm/recoverd.c

+5 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) 
	unsigned long start;

	int error, neg = 0;



	log_debug(ls, "recover %llx", rv->seq);

	log_debug(ls, "recover %llx", (unsigned long long)rv->seq);



	mutex_lock(&ls->ls_recoverd_active);
@@ -212,7 +212,8 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) 


	dlm_astd_wake();



	log_debug(ls, "recover %llx done: %u ms", rv->seq,

	log_debug(ls, "recover %llx done: %u ms",

		  (unsigned long long)rv->seq,

		  jiffies_to_msecs(jiffies - start));

	mutex_unlock(&ls->ls_recoverd_active);
@@ -220,7 +221,8 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv) 


 fail:

	dlm_release_root_list(ls);

	log_debug(ls, "recover %llx error %d", rv->seq, error);

	log_debug(ls, "recover %llx error %d",

		  (unsigned long long)rv->seq, error);

	mutex_unlock(&ls->ls_recoverd_active);

	return error;

}