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

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

staging: lustre: remove LPF64 #define 



Just use the proper string for the variable type.

Also remove some variable types that are not used at all (LPO64 and
LPPID)

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 fa8d5b44

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

+0 −7
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ 
# define LPD64 "%lld"

# define LPX64 "%#llx"

# define LPX64i "%llx"

# define LPO64 "%#llo"

# define LPF64 "L"



/*

 * long_ptr_t & ulong_ptr_t, same to "long" for gcc
@@ -84,9 +82,4 @@ 
# define LPLD "%ld"

# define LPLX "%#lx"



/*

 * pid_t

 */

# define LPPID "%d"



#endif

drivers/staging/lustre/lustre/fid/fid_request.c

+2 −2
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ int seq_client_get_seq(const struct lu_env *env, 
		return rc;

	}



	CDEBUG(D_INFO, "%s: allocate sequence [0x%16.16"LPF64"x]\n",

	CDEBUG(D_INFO, "%s: allocate sequence [0x%16.16Lx]\n",

	       seq->lcs_name, *seqnr);



	/* Since the caller require the whole seq,
@@ -336,7 +336,7 @@ int seq_client_alloc_fid(const struct lu_env *env, 
			return rc;

		}



		CDEBUG(D_INFO, "%s: Switch to sequence [0x%16.16"LPF64"x]\n",

		CDEBUG(D_INFO, "%s: Switch to sequence [0x%16.16Lx]\n",

		       seq->lcs_name, seqnr);



		seq->lcs_fid.f_oid = LUSTRE_FID_INIT_OID;

drivers/staging/lustre/lustre/include/lustre/lustre_idl.h

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static inline int range_compare_loc(const struct lu_seq_range *r1, 
	       r1->lsr_flags != r2->lsr_flags;

}



#define DRANGE "[%#16.16"LPF64"x-%#16.16"LPF64"x):%x:%s"

#define DRANGE "[%#16.16Lx-%#16.16Lx):%x:%s"



#define PRANGE(range)		\

	(range)->lsr_start,	\