From patchwork Thu May 18 06:26:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9732755 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 66D7A601BC for ; Thu, 18 May 2017 06:33:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3663527F81 for ; Thu, 18 May 2017 06:33:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A8BA28423; Thu, 18 May 2017 06:33:52 +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 C7A7A27F81 for ; Thu, 18 May 2017 06:33:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753653AbdERGdT (ORCPT ); Thu, 18 May 2017 02:33:19 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:33931 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754607AbdERG1e (ORCPT ); Thu, 18 May 2017 02:27:34 -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=t6mhmFYeRxHCqZOAlQfwv7pAbmU030i4rdvXJ0PYj3s=; b=Q/T7OPWrpH/Vvxyrsh5gr7OVV TmqqKnHuGduG//rMITj+4i/VLdXWwvAbeX+tfeaV0GUnnRnvWGCnc8rV2DFtm2buPTE5IMMUroVia 7o3sM0PLyHtTmArGUN6tsSDMttY55BZfVPxsHTace0/jaJNySCCJHs2oFZR/3jy9wOlFmfPnWo/Dt SkYz4/aFulKwGV/6oeDlNwa0En8jL1kHfxmpWT4bAQeHiw8S88ooc2/8bIhyTmgRiLciTKm8GkNtD hlj30M3UdC5EoaWPMlkVP22eF2r1ZeU/69me9PoVQS8AZ2Q4BG+wUhdC2BAo52OXdnqblv71S24j+ q8nGfZ4ng==; Received: from [46.125.249.66] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dBEuK-0001wX-70; Thu, 18 May 2017 06:27:33 +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 Subject: [PATCH 06/23] uuid: add the v1 layout to uuid_t Date: Thu, 18 May 2017 08:26:48 +0200 Message-Id: <20170518062705.25902-7-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170518062705.25902-1-hch@lst.de> References: <20170518062705.25902-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 Turn the content of uuid_t into a union and add the fields for the v1 interpretation to it. Signed-off-by: Christoph Hellwig Reviewed-by: David Howells --- include/linux/uuid.h | 59 ++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/include/linux/uuid.h b/include/linux/uuid.h index 0410cd002282..8bd1da4ec95d 100644 --- a/include/linux/uuid.h +++ b/include/linux/uuid.h @@ -18,40 +18,45 @@ #include -typedef struct { - __u8 b[16]; -} uuid_t; - -#define UUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ -((uuid_t) \ -{{ ((a) >> 24) & 0xff, ((a) >> 16) & 0xff, ((a) >> 8) & 0xff, (a) & 0xff, \ - ((b) >> 8) & 0xff, (b) & 0xff, \ - ((c) >> 8) & 0xff, (c) & 0xff, \ - (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }}) - -/* - * V1 (time-based) UUID definition [RFC 4122]. - * - the timestamp is a 60-bit value, split 32/16/12, and goes in 100ns - * increments since midnight 15th October 1582 - * - add AFS_UUID_TO_UNIX_TIME to convert unix time in 100ns units to UUID - * time - * - the clock sequence is a 14-bit counter to avoid duplicate times - */ -struct uuid_v1 { - __be32 time_low; /* low part of timestamp */ - __be16 time_mid; /* mid part of timestamp */ - __be16 time_hi_and_version; /* high part of timestamp and version */ +/* v1 UUID defintions: */ #define UUID_TO_UNIX_TIME 0x01b21dd213814000ULL #define UUID_TIMEHI_MASK 0x0fff #define UUID_VERSION_TIME 0x1000 /* time-based UUID */ #define UUID_VERSION_NAME 0x3000 /* name-based UUID */ #define UUID_VERSION_RANDOM 0x4000 /* (pseudo-)random generated UUID */ - u8 clock_seq_hi_and_reserved; /* clock seq hi and variant */ #define UUID_CLOCKHI_MASK 0x3f #define UUID_VARIANT_STD 0x80 - u8 clock_seq_low; /* clock seq low */ - u8 node[6]; /* spatially unique node ID (MAC addr) */ -}; + +typedef struct { + union { + __u8 b[16]; + + /* + * V1 (time-based) UUID definition [RFC 4122]: + * - the timestamp is a 60-bit value, split 32/16/12, and goes + * in 100ns increments since midnight 15th October 1582 + * - add UUID_TO_UNIX_TIME to convert unix time in 100ns + * units to UUID time + * - the clock sequence is a 14-bit counter to avoid duplicate + * times + */ + struct uuid_v1 { + __be32 time_low; + __be16 time_mid; + __be16 time_hi_and_version; + u8 clock_seq_hi_and_reserved; + u8 clock_seq_low; + u8 node[6]; + } v1; + }; +} uuid_t; + +#define UUID(a, _b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ +{.b = { \ + ((a) >> 24) & 0xff, ((a) >> 16) & 0xff, ((a) >> 8) & 0xff, (a) & 0xff, \ + ((_b) >> 8) & 0xff, (_b) & 0xff, \ + ((c) >> 8) & 0xff, (c) & 0xff, \ + (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }} /* * The length of a UUID string ("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")