diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2014-08-27 13:49:43 (GMT) |
---|---|---|
committer | Steve French <steve.french@primarydata.com> | 2014-12-08 04:48:01 (GMT) |
commit | 55d83e0dbb3ed91e05b11ef32afb30acfbf8ba45 (patch) | |
tree | a92417e84b7ea72828b1667821813fe8b04ddc80 /fs/cifs/misc.c | |
parent | 28e2aed244b1b81e45b105d90ffb82384665dfb7 (diff) | |
download | linux-55d83e0dbb3ed91e05b11ef32afb30acfbf8ba45.tar.xz |
cifs: convert to print_hex_dump() instead of custom implementation
This patch converts custom dumper to use native print_hex_dump() instead. The
cifs_dump_mem() will have an offsets per each line which differs it from the
original code.
In the dump_smb() we may use native print_hex_dump() as well. It will show
slightly different output in ASCII part when character is unprintable,
otherwise it keeps same structure.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Steve French <steve.french@primarydata.com>
Diffstat (limited to 'fs/cifs/misc.c')
-rw-r--r-- | fs/cifs/misc.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index b7415d5..3379463 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c @@ -513,39 +513,11 @@ is_valid_oplock_break(char *buffer, struct TCP_Server_Info *srv) void dump_smb(void *buf, int smb_buf_length) { - int i, j; - char debug_line[17]; - unsigned char *buffer = buf; - if (traceSMB == 0) return; - for (i = 0, j = 0; i < smb_buf_length; i++, j++) { - if (i % 8 == 0) { - /* have reached the beginning of line */ - printk(KERN_DEBUG "| "); - j = 0; - } - printk("%0#4x ", buffer[i]); - debug_line[2 * j] = ' '; - if (isprint(buffer[i])) - debug_line[1 + (2 * j)] = buffer[i]; - else - debug_line[1 + (2 * j)] = '_'; - - if (i % 8 == 7) { - /* reached end of line, time to print ascii */ - debug_line[16] = 0; - printk(" | %s\n", debug_line); - } - } - for (; j < 8; j++) { - printk(" "); - debug_line[2 * j] = ' '; - debug_line[1 + (2 * j)] = ' '; - } - printk(" | %s\n", debug_line); - return; + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_NONE, 8, 2, buf, + smb_buf_length, true); } void |