diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 01:23:18 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 01:23:18 (GMT) |
| commit | 143f378cf54cf24c831ce2139995a431303d51d3 (patch) | |
| tree | e2bc0a77ad9ccf4b8a4c6742d3a09c7381731711 /drivers | |
| parent | fa8d5b44740cd90551461e0ddbb34fbc6c914be5 (diff) | |
| download | linux-143f378cf54cf24c831ce2139995a431303d51d3.tar.xz | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/kp30.h | 7 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/fid/fid_request.c | 4 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h index 7b8107b..f4f73bd 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h @@ -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 diff --git a/drivers/staging/lustre/lustre/fid/fid_request.c b/drivers/staging/lustre/lustre/fid/fid_request.c index 8967599..e3708e3 100644 --- a/drivers/staging/lustre/lustre/fid/fid_request.c +++ b/drivers/staging/lustre/lustre/fid/fid_request.c @@ -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; diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h index 873af0f..27142a4 100644 --- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h @@ -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, \ |