mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 00:22:00 +02:00
nfsd: Replace open-coded conversion of bytes to hex
Since the Linux kernel's sprintf() has conversion to hex built-in via "%*phN", delete md5_to_hex() and just use that. Also add an explicit array bound to the dname parameter of nfs4_make_rec_clidname() to make its size clear. No functional change. Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Eric Biggers <ebiggers@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
parent
6ecdfd7aa8
commit
17695d72d0
|
|
@ -92,22 +92,8 @@ nfs4_reset_creds(const struct cred *original)
|
|||
put_cred(revert_creds(original));
|
||||
}
|
||||
|
||||
static void
|
||||
md5_to_hex(char *out, char *md5)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i=0; i<16; i++) {
|
||||
unsigned char c = md5[i];
|
||||
|
||||
*out++ = '0' + ((c&0xf0)>>4) + (c>=0xa0)*('a'-'9'-1);
|
||||
*out++ = '0' + (c&0x0f) + ((c&0x0f)>=0x0a)*('a'-'9'-1);
|
||||
}
|
||||
*out = '\0';
|
||||
}
|
||||
|
||||
static int
|
||||
nfs4_make_rec_clidname(char *dname, const struct xdr_netobj *clname)
|
||||
nfs4_make_rec_clidname(char dname[HEXDIR_LEN], const struct xdr_netobj *clname)
|
||||
{
|
||||
struct xdr_netobj cksum;
|
||||
struct crypto_shash *tfm;
|
||||
|
|
@ -133,7 +119,7 @@ nfs4_make_rec_clidname(char *dname, const struct xdr_netobj *clname)
|
|||
if (status)
|
||||
goto out;
|
||||
|
||||
md5_to_hex(dname, cksum.data);
|
||||
sprintf(dname, "%*phN", 16, cksum.data);
|
||||
|
||||
status = 0;
|
||||
out:
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user