From: Christoph Hellwig <hch@lst.de>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Amir Goldstein <amir73il@gmail.com>,
linux-fsdevel@vger.kernel.org
Cc: Shaohua Li <shli@kernel.org>,
Dan Williams <dan.j.williams@intel.com>,
David Howells <dhowells@redhat.com>,
Steven Whitehouse <swhiteho@redhat.com>,
Mimi Zohar <zohar@linux.vnet.ibm.com>,
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
Subject: [PATCH 08/24] uuid: rename uuid_to_bin to uuid_parse
Date: Wed, 31 May 2017 18:18:10 +0200 [thread overview]
Message-ID: <20170531161826.23243-9-hch@lst.de> (raw)
In-Reply-To: <20170531161826.23243-1-hch@lst.de>
This matches the userspace version of it, and describes the functionality
much better. Also do the same for the guid version.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
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);
--
2.11.0
next prev parent reply other threads:[~2017-05-31 16:19 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-31 16:18 cleanup UUID types V6 Christoph Hellwig
2017-05-31 16:18 ` [PATCH 01/24] uuid,afs: move struct uuid_v1 back into afs Christoph Hellwig
2017-05-31 16:18 ` [PATCH 02/24] xfs: use uuid_copy() helper to abstract uuid_t Christoph Hellwig
2017-05-31 16:18 ` [PATCH 03/24] xfs: use uuid_be to implement the uuid_t type Christoph Hellwig
2017-05-31 16:18 ` [PATCH 04/24] md: namespace private helper names Christoph Hellwig
2017-05-31 16:18 ` [PATCH 05/24] uuid: remove uuid_be defintions from the uapi header Christoph Hellwig
2017-05-31 16:18 ` [PATCH 06/24] uuid: rename uuid types Christoph Hellwig
2017-05-31 16:18 ` [PATCH 07/24] nfsd: namespace-prefix uuid_parse Christoph Hellwig
2017-05-31 16:18 ` Christoph Hellwig [this message]
2017-05-31 18:14 ` [PATCH 08/24] uuid: rename uuid_to_bin to uuid_parse Andy Shevchenko
2017-05-31 19:40 ` Christoph Hellwig
2017-05-31 16:18 ` [PATCH 09/24] uuid: don't export guid_index and uuid_index Christoph Hellwig
2017-05-31 16:18 ` [PATCH 10/24] uuid: hoist helpers uuid_equal() and uuid_copy() from xfs Christoph Hellwig
2017-05-31 16:18 ` [PATCH 11/24] uuid: hoist uuid_is_null() helper from libnvdimm Christoph Hellwig
2017-05-31 16:18 ` [PATCH 12/24] S390/sysinfo: use uuid_is_null instead of opencoding it Christoph Hellwig
2017-05-31 16:18 ` [PATCH 13/24] xfs: remove uuid_getnodeuniq and xfs_uu_t Christoph Hellwig
2017-05-31 16:18 ` [PATCH 14/24] xfs: use the common helper uuid_is_null() Christoph Hellwig
2017-05-31 16:18 ` [PATCH 15/24] block: remove blk_part_pack_uuid Christoph Hellwig
2017-05-31 18:16 ` Andy Shevchenko
2017-05-31 19:39 ` Christoph Hellwig
2017-05-31 16:18 ` [PATCH 16/24] ima/policy: switch to use uuid_t Christoph Hellwig
2017-05-31 16:18 ` [PATCH 17/24] fs: switch ->s_uuid to uuid_t Christoph Hellwig
2017-05-31 16:18 ` [PATCH 18/24] overlayfs: use uuid_t instead of uuid_be Christoph Hellwig
2017-05-31 16:18 ` [PATCH 19/24] partitions/ldm: switch to use uuid_t Christoph Hellwig
2017-05-31 16:18 ` [PATCH 20/24] sysctl: " Christoph Hellwig
2017-05-31 16:18 ` [PATCH 21/24] nvme: switch to uuid_t Christoph Hellwig
2017-05-31 16:18 ` [PATCH 22/24] scsi_debug: " Christoph Hellwig
2017-05-31 16:18 ` [PATCH 23/24] tmpfs: generate random sb->s_uuid Christoph Hellwig
2017-05-31 16:18 ` [PATCH 24/24] MAINTAINERS: add uuid entry Christoph Hellwig
2017-05-31 18:25 ` [PATCH 01/24] uuid,afs: move struct uuid_v1 back into afs David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170531161826.23243-9-hch@lst.de \
--to=hch@lst.de \
--cc=amir73il@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dan.j.williams@intel.com \
--cc=dhowells@redhat.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=shli@kernel.org \
--cc=swhiteho@redhat.com \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).