From patchwork Thu May 4 13:26:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9711967 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 844E460362 for ; Thu, 4 May 2017 13:26:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79FFF28665 for ; Thu, 4 May 2017 13:26:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E7652868D; Thu, 4 May 2017 13:26: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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 1E30028665 for ; Thu, 4 May 2017 13:26:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750848AbdEDN0g (ORCPT ); Thu, 4 May 2017 09:26:36 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34891 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751904AbdEDN02 (ORCPT ); Thu, 4 May 2017 09:26:28 -0400 Received: by mail-wm0-f67.google.com with SMTP id d79so3342296wmi.2; Thu, 04 May 2017 06:26:27 -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=nTK3sGRyrYIfGBICmmflNqnixtSdQQbPa29bglP64Ac=; b=ZIw54eBDcD9FvUKbvi8+/nZfoBdw+vp32gEgzot701nsUOd4mIUlAmZ8GZj2xFqogD j4B92dQ7letO5Ka2cBo2S5z3v6wh09T1JyO9qsVlyO/CEuU0TlTwv3FA27cIRC9fszyB 3i8XCwFcP/Qx24Z5oLcZnBmlvhs+fpkIFKzw8g+YsbEUtnO18shAaXmmjMoUe3bqV1f/ 4203aj1dnViTIhVqbsiwru8PJ5yplomO9xyA/y96E2X4Uck0G3x2sTXSXGPn5U6Qzfbb D72D1//JOLr4YV/ae25rwLITy3rs7wY4W9bvypSDCK6zuwXBqsxLoGZWIqj/jvQSsYD6 D20g== 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=nTK3sGRyrYIfGBICmmflNqnixtSdQQbPa29bglP64Ac=; b=s2xpPqqCpuu1nyw/XvBQ/vES6yHQWsl5gZ7IIBIxu7t2JM2OLJA60rUowNfnfyyDPG 1bhy8WbMexb9MgZByXw8kR/++GvL209kW7gmlOPd9rDb3oneff5st5H0ddSZqVAcDhqQ Pl83GcuvqcNIIo34EynoqUWpg5fa4eCGXakNIQFQfVadNWSBDitA0IFc0zF1ocEqd4aI FGyXNTAsWR3rEJIPoADizhrgEDswRIAreOCC6PbRjULhWmf/EKFRyiyZj3R9vLwd8/EN 570KsHG+wbA6s1v9YjZE6kCv335fVkDfTUo+tpMBnaQdo9yreIsviyU0JwsQ76ZYH8HL jPOQ== X-Gm-Message-State: AN3rC/4xNF0vDy2DDoWIzcJ2TXJpR92FPa7ffziXyL+32gYcW2qsEBZi umW4G75qKch2ig== X-Received: by 10.28.103.214 with SMTP id b205mr1933417wmc.126.1493904387117; Thu, 04 May 2017 06:26:27 -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.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 May 2017 06:26:26 -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 6/8] linux/uuid.h: hoist helpers uuid_equal() and uuid_copy() from xfs Date: Thu, 4 May 2017 16:26:21 +0300 Message-Id: <1493904383-2187-7-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-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These helper are used to compare and copy two uuid_t type objects. Signed-off-by: Amir Goldstein --- fs/xfs/uuid.c | 6 ------ fs/xfs/uuid.h | 7 ------- include/linux/uuid.h | 10 ++++++++++ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/fs/xfs/uuid.c b/fs/xfs/uuid.c index 16958e7..d41fa68 100644 --- a/fs/xfs/uuid.c +++ b/fs/xfs/uuid.c @@ -45,9 +45,3 @@ uuid_is_nil(uuid_t *uuid) if (*cp++) return 0; /* not nil */ return 1; /* is nil */ } - -int -uuid_equal(uuid_t *uuid1, uuid_t *uuid2) -{ - return memcmp(uuid1, uuid2, sizeof(uuid_t)) ? 0 : 1; -} diff --git a/fs/xfs/uuid.h b/fs/xfs/uuid.h index b40dee7..4911905 100644 --- a/fs/xfs/uuid.h +++ b/fs/xfs/uuid.h @@ -21,13 +21,6 @@ #include extern int uuid_is_nil(uuid_t *uuid); -extern int uuid_equal(uuid_t *uuid1, uuid_t *uuid2); extern void xfs_uuid_getnodeuniq(uuid_t *uuid, int fsid[2]); -static inline void -uuid_copy(uuid_t *dst, uuid_t *src) -{ - memcpy(dst, src, sizeof(uuid_t)); -} - #endif /* __XFS_SUPPORT_UUID_H__ */ diff --git a/include/linux/uuid.h b/include/linux/uuid.h index 02253f0..a1dd9cc 100644 --- a/include/linux/uuid.h +++ b/include/linux/uuid.h @@ -58,6 +58,16 @@ static inline int uuid_be_cmp(const uuid_be u1, const uuid_be u2) return memcmp(&u1, &u2, sizeof(uuid_be)); } +static inline bool uuid_equal(const uuid_t *u1, const uuid_t *u2) +{ + return (memcmp(u1, u2, sizeof(uuid_t)) == 0); +} + +static inline void uuid_copy(uuid_t *dst, const uuid_t *src) +{ + memcpy(dst, src, sizeof(uuid_t)); +} + void generate_random_uuid(unsigned char uuid[16]); extern void uuid_le_gen(uuid_le *u);