From patchwork Thu May 4 13:26:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9711957 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 2A76B60362 for ; Thu, 4 May 2017 13:26:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FB4928665 for ; Thu, 4 May 2017 13:26:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 136782868D; Thu, 4 May 2017 13:26:29 +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.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham 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 BA6BF28665 for ; Thu, 4 May 2017 13:26:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752345AbdEDN01 (ORCPT ); Thu, 4 May 2017 09:26:27 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:35868 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751904AbdEDN0W (ORCPT ); Thu, 4 May 2017 09:26:22 -0400 Received: by mail-wr0-f196.google.com with SMTP id v42so1443364wrc.3; Thu, 04 May 2017 06:26:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8f1/uarb6gtYtRqfXl9rMsXkc7JNpZ4YnFaKJo0tOcE=; b=a86dNF1VeNc3DrMTKfBUZpW6ivNUjPDMDF7pkJcxCIrV9JtLTwmNyCpOOtHdf7uyBs qKtTIXU+xGcS9uhTzXA9QclgqKgGeCl0GH7zyHliOeWOuTPO/PctDoMxyBIe5UllMZSJ RtJNhjQbEQbIPi6iEHJwF7XGB45CnBDdBpLIZD6wzqUxJEXM5UpKss5h2SgMSY2x1AK9 ucgj/VZciYvCL2EUNzqvDqYJ5rwL5C4/M3WbZqRapqISI5hc7yqPc+iwYdoav4lI3P46 Rawd0CyTBLmMUrNouIHEYsY2RxHHGx0TGPbDsAx0+j/21lCBZyNEA+hM/Uf3VvRfZq5K sXrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8f1/uarb6gtYtRqfXl9rMsXkc7JNpZ4YnFaKJo0tOcE=; b=ekj3DKLVAvAp9iw0BzseryrfUTIoRBCwLDtcu+UmfCDR2nSX+5cZ85LeX0mk3tRX8d 2792w+iPCF+C1vCsepkWIXTuta5iv7al+tCbjrl/qwjX1HiBHhTNKdaKS9A5CzdsXmYo HiV8122E5h4gJBtEkZ1qahB2vdo3JoRTj4XMZ22Bp6XX5sV81BTogREmLyYJX48oppfP t1nefkVKR8o4nBjThbh4zYUx/90NomzDnTsZ03gT1CMoVzAwyIRh3MOd6Vyn3/Je1npO 5dTUvhdNU4F9dOG1Tou/G8XGcex7Jelfst2RpXfzOjFkHpqapmAvFvBsy4XnZI2e5aiO ULpw== X-Gm-Message-State: AN3rC/65Laqza7eR/VhslBf2EHHdBWKJ41KAaqrqLVGDJw7noQs5Ha3k TRoXUxreaReNmg== X-Received: by 10.223.166.48 with SMTP id k45mr25673898wrc.190.1493904381053; Thu, 04 May 2017 06:26:21 -0700 (PDT) Received: from amir-VirtualBox.ctera.local (bzq-166-168-31-246.red.bezeqint.net. [31.168.166.246]) by smtp.gmail.com with ESMTPSA id m201sm1831681wmd.15.2017.05.04.06.26.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 May 2017 06:26:20 -0700 (PDT) From: Amir Goldstein To: "Darrick J . Wong" Cc: Christoph Hellwig , Miklos Szeredi , Theodore Tso , Richard Weinberger , Mark Fasheh , Dan Williams , Andy Shevchenko , David Howells , Shaohua Li , Al Viro , linux-xfs@vger.kernel.org, linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v2 3/8] xfs: dismiss xfs_uu_t Date: Thu, 4 May 2017 16:26:18 +0300 Message-Id: <1493904383-2187-4-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493904383-2187-1-git-send-email-amir73il@gmail.com> References: <1493904383-2187-1-git-send-email-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP uuid_t (a.k.a struct uuid_v1) already provides the fields needed by uuid_getnodeuniq(), so use them directly. Signed-off-by: Amir Goldstein --- fs/xfs/uuid.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/fs/xfs/uuid.c b/fs/xfs/uuid.c index b83f76b..7bb4fb8 100644 --- a/fs/xfs/uuid.c +++ b/fs/xfs/uuid.c @@ -17,15 +17,6 @@ */ #include -/* IRIX interpretation of an uuid_t */ -typedef struct { - __be32 uu_timelow; - __be16 uu_timemid; - __be16 uu_timehi; - __be16 uu_clockseq; - __be16 uu_node[3]; -} xfs_uu_t; - /* * uuid_getnodeuniq - obtain the node unique fields of a UUID. * @@ -35,11 +26,10 @@ typedef struct { void uuid_getnodeuniq(uuid_t *uuid, int fsid [2]) { - xfs_uu_t *uup = (xfs_uu_t *)uuid; - - fsid[0] = (be16_to_cpu(uup->uu_clockseq) << 16) | - be16_to_cpu(uup->uu_timemid); - fsid[1] = be32_to_cpu(uup->uu_timelow); + fsid[0] = (uuid->clock_seq_hi_and_reserved << 24) | + (uuid->clock_seq_low << 16) | + be16_to_cpu(uuid->time_mid); + fsid[1] = be32_to_cpu(uuid->time_low); } int