From patchwork Wed May 31 16:18:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9757717 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9AF73602F0 for ; Wed, 31 May 2017 16:25:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C740281F9 for ; Wed, 31 May 2017 16:25:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7FEBF28338; Wed, 31 May 2017 16:25:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 124512766D for ; Wed, 31 May 2017 16:25:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751313AbdEaQTa (ORCPT ); Wed, 31 May 2017 12:19:30 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:39705 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751041AbdEaQT1 (ORCPT ); Wed, 31 May 2017 12:19:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Dd2AmqH+JBdqNcnubWjeKGuRDe+KZEfli8Z52WaT7SY=; b=AoAnyj3ZwYZ4Ub1aIqgnFuBOX 3ZRiBkscY5c32Y7vc7bkLTENAsSLcdqqZOwqNHGM3/ae3Udlg+CxVPqzEms1qfCoLDOM6ZIrtmJph a9QF4XZWEK4nRRlvV5eGLYSQ02tT002Xk511e1KvfhuJKSf8Ya19j3Nnm7IN+7CLpCi6FceUmj/7b kfRezY1d5jtMItWuop7ez5F9YQ0uYq0/jsLiZoJybbcJf8k4kRtB1KFGeFM0BBK8FVjY4jDtOftfE cdrECr9LmzWbgN0NHvA/5sIIeOh23VKe5IUu/luCWRRYnebULB4XvC7p95LNBD6MRM5ca/Wkh02El w7W/kEsqg==; Received: from [46.183.103.17] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dG6LB-0003Eb-49; Wed, 31 May 2017 16:19:21 +0000 From: Christoph Hellwig To: Andy Shevchenko , 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 Subject: [PATCH 08/24] uuid: rename uuid_to_bin to uuid_parse Date: Wed, 31 May 2017 18:18:10 +0200 Message-Id: <20170531161826.23243-9-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170531161826.23243-1-hch@lst.de> References: <20170531161826.23243-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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);