[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [Cluster-devel] [DLM] fix format warnings in rcom.c and recoverd.c



Hi,

I had to fix this up as it didn't apply directly to my git tree
(conflict was in rcom.c) but I've pushed it now to my -nmw git tree, so
once kernel.org updates to show it, please check to see that I've done
the right thing,

Steve.

On Tue, 2006-11-28 at 16:06 +0900, Ryusuke Konishi wrote:
> 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: Ryusuke Konishi <ryusuke osrg net>
> ---
> 
> diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
> index 518239a..444af57 100644
> --- a/fs/dlm/rcom.c
> +++ b/fs/dlm/rcom.c
> @@ -152,7 +152,8 @@ static void receive_sync_reply(struct dl
>  {
>  	if (rc_in->rc_id != ls->ls_rcom_seq) {
>  		log_debug(ls, "reject old reply %d got %llx wanted %llx",
> -			  rc_in->rc_type, rc_in->rc_id, ls->ls_rcom_seq);
> +			  rc_in->rc_type, (unsigned long long)rc_in->rc_id,
> +			  (unsigned long long)ls->ls_rcom_seq);
>  		return;
>  	}
>  	memcpy(ls->ls_recover_buf, rc_in, rc_in->rc_header.h_length);
> diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c
> index 362e3ef..75be53a 100644
> --- a/fs/dlm/recoverd.c
> +++ b/fs/dlm/recoverd.c
> @@ -45,7 +45,7 @@ static int ls_recover(struct dlm_ls *ls,
>  	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);
>  
> @@ -199,7 +199,8 @@ static int ls_recover(struct dlm_ls *ls,
>  
>  	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);
>  
> @@ -207,7 +208,8 @@ static int ls_recover(struct dlm_ls *ls,
>  
>   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;
>  }
> 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]