From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <1496254475.28981.36.camel@linux.intel.com> Subject: Re: [PATCH 08/24] uuid: rename uuid_to_bin to uuid_parse From: Andy Shevchenko To: Christoph Hellwig , Amir Goldstein , linux-fsdevel@vger.kernel.org Cc: Shaohua Li , Dan Williams , David Howells , Steven Whitehouse , Mimi Zohar , linux-xfs@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Date: Wed, 31 May 2017 21:14:35 +0300 In-Reply-To: <20170531161826.23243-9-hch@lst.de> References: <20170531161826.23243-1-hch@lst.de> <20170531161826.23243-9-hch@lst.de> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: On Wed, 2017-05-31 at 18:18 +0200, Christoph Hellwig wrote: > This matches the userspace version of it, and describes the > functionality > much better.  Also do the same for the guid version. > No objections for renaming, though I'm pretty sure it should be squashed to patch 6. > Signed-off-by: Christoph Hellwig > --- >  include/linux/uuid.h |  8 ++++---- >  lib/test_uuid.c      |  8 ++++---- >  lib/uuid.c           | 14 +++++++------- >  3 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/include/linux/uuid.h b/include/linux/uuid.h > index a9d0fdba5404..82b165b579f5 100644 > --- a/include/linux/uuid.h > +++ b/include/linux/uuid.h > @@ -45,8 +45,8 @@ bool __must_check uuid_is_valid(const char *uuid); >  extern const u8 guid_index[16]; >  extern const u8 uuid_index[16]; >   > -int guid_to_bin(const char *uuid, guid_t *u); > -int uuid_to_bin(const char *uuid, uuid_t *u); > +int guid_parse(const char *uuid, guid_t *u); > +int uuid_parse(const char *uuid, uuid_t *u); >   >  /* backwards compatibility, don't use in new code */ >  typedef uuid_t uuid_be; > @@ -58,8 +58,8 @@ typedef uuid_t uuid_be; >   >  #define uuid_le_gen(u) guid_gen(u) >  #define uuid_be_gen(u) uuid_gen(u) > -#define uuid_le_to_bin(guid, u) guid_to_bin(guid, u) > -#define uuid_be_to_bin(uuid, u) uuid_to_bin(uuid, u) > +#define uuid_le_to_bin(guid, u) guid_parse(guid, u) > +#define uuid_be_to_bin(uuid, u) uuid_parse(uuid, u) >   >  static inline int uuid_le_cmp(const guid_t u1, const guid_t u2) >  { > diff --git a/lib/test_uuid.c b/lib/test_uuid.c > index 9cad846fd805..edda536a7b45 100644 > --- a/lib/test_uuid.c > +++ b/lib/test_uuid.c > @@ -67,7 +67,7 @@ static void __init test_uuid_test(const struct > test_uuid_data *data) >   >   /* LE */ >   total_tests++; > - if (guid_to_bin(data->uuid, &le)) > + if (guid_parse(data->uuid, &le)) >   test_uuid_failed("conversion", false, false, data- > >uuid, NULL); >   >   total_tests++; > @@ -78,7 +78,7 @@ static void __init test_uuid_test(const struct > test_uuid_data *data) >   >   /* BE */ >   total_tests++; > - if (uuid_to_bin(data->uuid, &be)) > + if (uuid_parse(data->uuid, &be)) >   test_uuid_failed("conversion", false, true, data- > >uuid, NULL); >   >   total_tests++; > @@ -95,12 +95,12 @@ static void __init test_uuid_wrong(const char > *data) >   >   /* LE */ >   total_tests++; > - if (!guid_to_bin(data, &le)) > + if (!guid_parse(data, &le)) >   test_uuid_failed("negative", true, false, data, > NULL); >   >   /* BE */ >   total_tests++; > - if (!uuid_to_bin(data, &be)) > + if (!uuid_parse(data, &be)) >   test_uuid_failed("negative", true, true, data, NULL); >  } >   > diff --git a/lib/uuid.c b/lib/uuid.c > index f80dc63f6ca8..90bee73f7bd7 100644 > --- a/lib/uuid.c > +++ b/lib/uuid.c > @@ -97,7 +97,7 @@ bool uuid_is_valid(const char *uuid) >  } >  EXPORT_SYMBOL(uuid_is_valid); >   > -static int __uuid_to_bin(const char *uuid, __u8 b[16], const u8 > ei[16]) > +static int __uuid_parse(const char *uuid, __u8 b[16], const u8 > ei[16]) >  { >   static const u8 si[16] = > {0,2,4,6,9,11,14,16,19,21,24,26,28,30,32,34}; >   unsigned int i; > @@ -115,14 +115,14 @@ static int __uuid_to_bin(const char *uuid, __u8 > b[16], const u8 ei[16]) >   return 0; >  } >   > -int guid_to_bin(const char *uuid, guid_t *u) > +int guid_parse(const char *uuid, guid_t *u) >  { > - return __uuid_to_bin(uuid, u->b, guid_index); > + return __uuid_parse(uuid, u->b, guid_index); >  } > -EXPORT_SYMBOL(guid_to_bin); > +EXPORT_SYMBOL(guid_parse); >   > -int uuid_to_bin(const char *uuid, uuid_t *u) > +int uuid_parse(const char *uuid, uuid_t *u) >  { > - return __uuid_to_bin(uuid, u->b, uuid_index); > + return __uuid_parse(uuid, u->b, uuid_index); >  } > -EXPORT_SYMBOL(uuid_to_bin); > +EXPORT_SYMBOL(uuid_parse); -- Andy Shevchenko Intel Finland Oy