From patchwork Mon May 15 15:42:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9727483 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 4C63A60386 for ; Mon, 15 May 2017 15:47:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 460832897F for ; Mon, 15 May 2017 15:47:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AC6028995; Mon, 15 May 2017 15:47:09 +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 0CFE628991 for ; Mon, 15 May 2017 15:47:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934943AbdEOPqu (ORCPT ); Mon, 15 May 2017 11:46:50 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:54856 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934821AbdEOPne (ORCPT ); Mon, 15 May 2017 11:43: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=NC9wFZh4ZK2FXcVqjej2cf7ZtWBPlBIyTDMpTCpxkuo=; b=UzkMovElLMuu0kKossBYz58rq 9uNPqdFIlUt4DSzeGF1EObRdhB2ujQEzxzIkllWRPtpHPv+Ncs4C0JBkjPJC87frWX8C38AcHVWMf s5DM/PphZKiIT7fYJSrRHLU8AbHQhOijJux0srmGlaZFKqAhDPBW3EUv7sZ6pePwU7Mbf+JW/MV/v G6B0lwLi9OSfX12er4EkJTwVfP0ex7Zq5teP0+P8HCQWI8FGiPVvcOnj9InutrjqKER2eff7oRV9W GEJY3W1vhETY8VDUrcOr6RgcLa6SoGo5RMXgRF5Cx1QfE52K1x7Tf6o21EzPLh6olkltAO/WLTf4D vklUR5itg==; Received: from clnet-p099-196.ikbnet.co.at ([83.175.99.196] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dAI9b-0006JH-LV; Mon, 15 May 2017 15:43:24 +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 05/17] uuid: add the v1 layout to uuid_t Date: Mon, 15 May 2017 17:42:56 +0200 Message-Id: <20170515154308.26739-6-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170515154308.26739-1-hch@lst.de> References: <20170515154308.26739-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/uapi/linux/uuid.h | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/include/uapi/linux/uuid.h b/include/uapi/linux/uuid.h index c31fc94695b9..6b6a583ec1fe 100644 --- a/include/uapi/linux/uuid.h +++ b/include/uapi/linux/uuid.h @@ -32,15 +32,42 @@ typedef struct { (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }}) typedef struct { - __u8 b[16]; + 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 { + __be32 time_low; + __be16 time_mid; + __be16 time_hi_and_version; +#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; +#define UUID_CLOCKHI_MASK 0x3f +#define UUID_VARIANT_STD 0x80 + u8 clock_seq_low; + u8 node[6]; + } v1; + }; } 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, \ +#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) }}) + (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }} /* backwards compatibility, don't use in new code */ typedef guid_t uuid_le;