[PATCH v2] cifs: call print_hex_dump instead of custom implementation

Jeff Layton jlayton at poochiereds.net
Mon May 12 09:42:47 MDT 2014


On Mon, 12 May 2014 18:15:20 +0300
Andy Shevchenko <andriy.shevchenko at linux.intel.com> wrote:

> This patch converts custom dumper to use native print_hex_dump() instead. The
> dump will have a given label and addresses per each line which differs it from
> the original code.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>
> ---
>  fs/cifs/cifs_debug.c | 21 ++-------------------
>  1 file changed, 2 insertions(+), 19 deletions(-)
> 
> diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
> index fa78b68..e7b87ce 100644
> --- a/fs/cifs/cifs_debug.c
> +++ b/fs/cifs/cifs_debug.c
> @@ -34,27 +34,10 @@
>  void
>  cifs_dump_mem(char *label, void *data, int length)
>  {
> -	int i, j;
> -	int *intptr = data;
> -	char *charptr = data;
> -	char buf[10], line[80];
> -
>  	printk(KERN_DEBUG "%s: dump of %d bytes of data at 0x%p\n",
>  		label, length, data);
> -	for (i = 0; i < length; i += 16) {
> -		line[0] = 0;
> -		for (j = 0; (j < 4) && (i + j * 4 < length); j++) {
> -			sprintf(buf, " %08x", intptr[i / 4 + j]);
> -			strcat(line, buf);
> -		}
> -		buf[0] = ' ';
> -		buf[2] = 0;
> -		for (j = 0; (j < 16) && (i + j < length); j++) {
> -			buf[1] = isprint(charptr[i + j]) ? charptr[i + j] : '.';
> -			strcat(line, buf);
> -		}
> -		printk(KERN_DEBUG "%s\n", line);
> -	}
> +	print_hex_dump(KERN_DEBUG, label, DUMP_PREFIX_ADDRESS, 16, 4,
> +		       data, length, true);

I'm not sure we want "label" as the prefix_str as it'll go on every
line. Maybe just use "" in place of "label" there?

>  }
>  
>  #ifdef CONFIG_CIFS_DEBUG

Otherwise, this looks good.

Acked-by: Jeff Layton <jlayton at poochiereds.net>


More information about the samba-technical mailing list