staging: lustre: remove LPX64i define
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Jul 2014 01:31:44 +0000 (18:31 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Jul 2014 01:31:44 +0000 (18:31 -0700)
Just use the proper modifier type...

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
drivers/staging/lustre/lustre/include/lustre/lustre_user.h

index a1722bd95874eb18cd05ceafa9dc6fafc9669571..cba961269b1f5686c380d56c84c55050c94d71e2 100644 (file)
@@ -73,6 +73,5 @@
 # define LPU64 "%llu"
 # define LPD64 "%lld"
 # define LPX64 "%#llx"
-# define LPX64i "%llx"
 
 #endif
index 27142a4bef1e9042257e054ca423ef8411f43e20..ff3cff7c08cb888a135926c65366a0714bd55abd 100644 (file)
@@ -2747,7 +2747,7 @@ struct ldlm_res_id {
        __u64 name[RES_NAME_SIZE];
 };
 
-#define DLDLMRES       "["LPX64":"LPX64":"LPX64"]."LPX64i
+#define DLDLMRES       "["LPX64":"LPX64":"LPX64"].%llx"
 #define PLDLMRES(res)  (res)->lr_name.name[0], (res)->lr_name.name[1], \
                        (res)->lr_name.name[2], (res)->lr_name.name[3]
 
index 9bbd9042d6646fe2182e94a257c6d10b18b0b30a..74757f7d1dbbe44d304408412ba3b628c9caee2e 100644 (file)
@@ -484,11 +484,7 @@ static inline void obd_uuid2fsname(char *buf, char *uuid, int buflen)
 
 /* scanf input parse format -- strip '[' first.
    e.g. sscanf(fidstr, SFID, RFID(&fid)); */
-/* #define SFID "0x"LPX64i":0x"LPSZX":0x"LPSZX""
-liblustreapi.c:2893: warning: format '%lx' expects type 'long unsigned int *', but argument 4 has type 'unsigned int *'
-liblustreapi.c:2893: warning: format '%lx' expects type 'long unsigned int *', but argument 5 has type 'unsigned int *'
-*/
-#define SFID "0x"LPX64i":0x%x:0x%x"
+#define SFID "0x%llx:0x%x:0x%x"
 #define RFID(fid)     \
        &((fid)->f_seq), \
        &((fid)->f_oid), \