From patchwork Fri May 5 07:57:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9713117 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 6192360362 for ; Fri, 5 May 2017 07:57:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CCDC28646 for ; Fri, 5 May 2017 07:57:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40635286A0; Fri, 5 May 2017 07:57:47 +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=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 DBD7028646 for ; Fri, 5 May 2017 07:57:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755303AbdEEH5q (ORCPT ); Fri, 5 May 2017 03:57:46 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:35571 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755120AbdEEH5p (ORCPT ); Fri, 5 May 2017 03:57:45 -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=ftKfRJDo+d4CCwWB0afN2UktX5YkjXNQixKhIyj2zYU=; b=oHdbW4lVgztC7gsMToScsdW5V Ho+41Rr3RbRx+lAg+Hg9OV5RZVSDqz+xFdXDz3+YuJdFrZifYavSNDKdJxgTZf1g4o/LE3Gja8p0i hdOsfcj6zzRt1A3YPR/PLyrBlS4AeJIf9H+6DSiB348oyitc/1EHyStEmwnRpt4DPFX0mUBReN8So Tq5TyHglAbd2docA/Y8tEo1H6Bny9xgYypKc8Trqa95hK6sUbsfi6DUKQR/ZJeSfVsjzXZz12pKKB 2PZBdPgu/7c5upiPhgCsH9mQ4maWsAXK7oDHf1n3PJUIWq6Zpa2GvMyHzN5WJRMKzMSnC4KvWkvzk H2QgYRLSQ==; Received: from [85.235.16.11] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1d6Y7P-0006lj-Sa; Fri, 05 May 2017 07:57:40 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: amir73il@gmail.com Subject: [PATCH 3/3] xfs: remove uuid_getnodeuniq and xfs_uu_t Date: Fri, 5 May 2017 09:57:25 +0200 Message-Id: <20170505075725.19597-4-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170505075725.19597-1-hch@lst.de> References: <20170505075725.19597-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 And just opencode retreiving the UUID v1 information in the only caller using get_unaligned_be*. Signed-off-by: Christoph Hellwig Reviewed-by: Amir Goldstein --- fs/xfs/uuid.c | 25 ------------------------- fs/xfs/uuid.h | 1 - fs/xfs/xfs_mount.c | 5 ++++- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/fs/xfs/uuid.c b/fs/xfs/uuid.c index b83f76b6d410..937deaf2128d 100644 --- a/fs/xfs/uuid.c +++ b/fs/xfs/uuid.c @@ -17,31 +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. - * - * This is not in any way a standard or condoned UUID function; - * it just something that's needed for user-level file handles. - */ -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); -} - int uuid_is_nil(uuid_t *uuid) { diff --git a/fs/xfs/uuid.h b/fs/xfs/uuid.h index 4f1441ba4fa5..65b5cebf2f99 100644 --- a/fs/xfs/uuid.h +++ b/fs/xfs/uuid.h @@ -20,7 +20,6 @@ extern int uuid_is_nil(uuid_t *uuid); extern int uuid_equal(uuid_t *uuid1, uuid_t *uuid2); -extern void uuid_getnodeuniq(uuid_t *uuid, int fsid [2]); static inline void uuid_copy(uuid_t *dst, uuid_t *src) diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 688ebff1f663..5bf1edb0986d 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -789,7 +789,10 @@ xfs_mountfs( * Copies the low order bits of the timestamp and the randomly * set "sequence" number out of a UUID. */ - uuid_getnodeuniq(&sbp->sb_uuid, mp->m_fixedfsid); + mp->m_fixedfsid[0] = + (get_unaligned_be16(&sbp->sb_uuid.b[8]) << 16) | + get_unaligned_be16(&sbp->sb_uuid.b[4]); + mp->m_fixedfsid[1] = get_unaligned_be32(&sbp->sb_uuid.b[0]); mp->m_dmevmask = 0; /* not persistent; set after each mount */