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>

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
index 7b8107b133de4e40c6cb7ed3880da2f9beab1b9f..f4f73bd1b2d6129f9dbcbd8e4ef3d4ab89cd399e 100644 (file)
--- 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 8967599061be5a3271e53b8e0948040df79be80b..e3708e3583254642dee1a92c2036d287635ba10b 100644 (file)
--- 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 873af0f1e1562718682fd02d4bf8979da046d417..27142a4bef1e9042257e054ca423ef8411f43e20 100644 (file)
--- 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,     \