Merge tag 'dt2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / fs / cifs / misc.c

diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index b7415d5..3379463 100644 (file)
--- 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