Commit 12b4157b authored by Andy Shevchenko's avatar Andy Shevchenko Committed by J. Bruce Fields

nfsd: remove private bin2hex implementation

Calling sprintf in a loop is not very efficient, and in any case,
we already have an implementation of bin-to-hex conversion in lib/
which we might as well use.

Note that original code used to nul-terminate the destination while
bin2hex doesn't. That's why replace kmalloc() with kzalloc().
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 6e73e92b
...@@ -1850,19 +1850,14 @@ nfsd4_umh_cltrack_upcall(char *cmd, char *arg, char *env0, char *env1) ...@@ -1850,19 +1850,14 @@ nfsd4_umh_cltrack_upcall(char *cmd, char *arg, char *env0, char *env1)
static char * static char *
bin_to_hex_dup(const unsigned char *src, int srclen) bin_to_hex_dup(const unsigned char *src, int srclen)
{ {
int i; char *buf;
char *buf, *hex;
/* +1 for terminating NULL */ /* +1 for terminating NULL */
buf = kmalloc((srclen * 2) + 1, GFP_KERNEL); buf = kzalloc((srclen * 2) + 1, GFP_KERNEL);
if (!buf) if (!buf)
return buf; return buf;
hex = buf; bin2hex(buf, src, srclen);
for (i = 0; i < srclen; i++) {
sprintf(hex, "%2.2x", *src++);
hex += 2;
}
return buf; return buf;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment