diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 18:28:41 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 18:28:41 -0700 |
| commit | eafc75596fadb1cefa25a392317956395e4eee7d (patch) | |
| tree | 95a107615f59d1b2faf11d12983ac1e2e71fc068 /drivers/staging/lustre | |
| parent | 143f378cf54cf24c831ce2139995a431303d51d3 (diff) | |
| download | blackbird-op-linux-eafc75596fadb1cefa25a392317956395e4eee7d.tar.gz blackbird-op-linux-eafc75596fadb1cefa25a392317956395e4eee7d.zip | |
staging: lustre: remove LPLU, LPLD, and LPLX defines
They are variable modifiers, come on, no need for a special define just
for them...
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/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/kp30.h | 7 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/libcfs/debug.c | 6 |
2 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 f4f73bd1b2d6..a1722bd95874 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h @@ -75,11 +75,4 @@ # define LPX64 "%#llx" # define LPX64i "%llx" -/* - * long_ptr_t & ulong_ptr_t, same to "long" for gcc - */ -# define LPLU "%lu" -# define LPLD "%ld" -# define LPLX "%#lx" - #endif diff --git a/drivers/staging/lustre/lustre/libcfs/debug.c b/drivers/staging/lustre/lustre/libcfs/debug.c index 5765cbb185e0..6b584698d3ae 100644 --- a/drivers/staging/lustre/lustre/libcfs/debug.c +++ b/drivers/staging/lustre/lustre/libcfs/debug.c @@ -342,7 +342,7 @@ void libcfs_debug_dumplog_internal(void *arg) if (strncmp(libcfs_debug_file_path_arr, "NONE", 4) != 0) { snprintf(debug_file_name, sizeof(debug_file_name) - 1, - "%s.%ld." LPLD, libcfs_debug_file_path_arr, + "%s.%ld.%ld", libcfs_debug_file_path_arr, get_seconds(), (long_ptr_t)arg); printk(KERN_ALERT "LustreError: dumping log to %s\n", debug_file_name); @@ -463,7 +463,7 @@ EXPORT_SYMBOL(libcfs_debug_set_level); void libcfs_log_goto(struct libcfs_debug_msg_data *msgdata, const char *label, long_ptr_t rc) { - libcfs_debug_msg(msgdata, "Process leaving via %s (rc=" LPLU " : " LPLD - " : " LPLX ")\n", label, (ulong_ptr_t)rc, rc, rc); + libcfs_debug_msg(msgdata, "Process leaving via %s (rc=%lu : %ld : %#lx)\n", + label, (ulong_ptr_t)rc, rc, rc); } EXPORT_SYMBOL(libcfs_log_goto); |
