From patchwork Thu May 4 13:26:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9711965 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 A3BCB60362 for ; Thu, 4 May 2017 13:26:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99C6328665 for ; Thu, 4 May 2017 13:26:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E6412868D; Thu, 4 May 2017 13:26:35 +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 4747B28665 for ; Thu, 4 May 2017 13:26:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753774AbdEDN0d (ORCPT ); Thu, 4 May 2017 09:26:33 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34462 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753283AbdEDN01 (ORCPT ); Thu, 4 May 2017 09:26:27 -0400 Received: by mail-wm0-f66.google.com with SMTP id z129so3331987wmb.1; Thu, 04 May 2017 06:26:26 -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=dapYYctNC0DgFt6udN/fq52Be0ugnMxS9yH4GsPX/DE=; b=h8zourmgO7ug+wPbA41RFYVYC1kt8qa0gTWZVoPxliWEJb8IiB4VnSWPfqJdS0YOlx xJDpDPMdJL5vPEEmJpfXiAKlQnPHoqrb1NPNRw3JNmFu1eFddpgZtuBJxozw5iKBTbjo b3WvT4KujXIybOipNlkvVZ93Qwiy/rlWRJXWIPKs2LvOWcIj5ZqAJS4De98Cm3ainJ92 TqU1xaZeZ5J9c87d334PRarmXPHTUQ6bSr9Drz6WtrAPVqCOyFNE4hqh2IbrithAnduX ns3Jf7CvVpzEml6AUQarukOazOO/OxhxJi3dSUo2QI2V4h5ArtTm4ahFCrOp8zS9M0Bc UaCg== 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=dapYYctNC0DgFt6udN/fq52Be0ugnMxS9yH4GsPX/DE=; b=S3yNnO6oNmd8f71L2nwuwMQCmcFJc5lPKBbMmHDuYw4Zl4Ix2RJC++NoZCWFPk9TFO SlKrNvgMPGPUsJjH+3iznFWcFoxLTYZeT5M94taKO+7LOedKSG6Nq8PYEdU2NGoXSrs7 23sBomMH/Yb1oBKRsgHvuX/qFVSZmSDL3OC3cxuCOjDyuW128HcdaAHvcZQMlKtOs63P 0IdLPgLYLHfxBWLBkV1cgnsIwJ5xFqhIMGrVuIyZGBE41Lgm51vGXQ9LEGNPUkfsCSnq 6q4/TkDjdJHUZuKzTJE3+a16OBWCCgPNZ6RIWkPE8iEowIjRIss8Nek9Ug8vT/ghLB5m pdUQ== X-Gm-Message-State: AN3rC/78Qkdmmhpz8J+s3owqfesn8+xWOsmmSkZ+BKycohkMYAy2BxlO GPAR9QyhppqGJA== X-Received: by 10.28.92.84 with SMTP id q81mr1797552wmb.11.1493904385168; Thu, 04 May 2017 06:26:25 -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.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 May 2017 06:26:24 -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 5/8] md: namespace private helper names Date: Thu, 4 May 2017 16:26:20 +0300 Message-Id: <1493904383-2187-6-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 The md private helper uuid_equal() collides with a generic helper of the same name. Rename the md private helper to md_uuid_equal() and do the same for md_sb_equal(). Cc: Shaohua Li Signed-off-by: Amir Goldstein --- drivers/md/md.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 548d1b8..e3a5163 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -821,7 +821,7 @@ static int read_disk_sb(struct md_rdev *rdev, int size) return -EINVAL; } -static int uuid_equal(mdp_super_t *sb1, mdp_super_t *sb2) +static int md_uuid_equal(mdp_super_t *sb1, mdp_super_t *sb2) { return sb1->set_uuid0 == sb2->set_uuid0 && sb1->set_uuid1 == sb2->set_uuid1 && @@ -829,7 +829,7 @@ static int uuid_equal(mdp_super_t *sb1, mdp_super_t *sb2) sb1->set_uuid3 == sb2->set_uuid3; } -static int sb_equal(mdp_super_t *sb1, mdp_super_t *sb2) +static int md_sb_equal(mdp_super_t *sb1, mdp_super_t *sb2) { int ret; mdp_super_t *tmp1, *tmp2; @@ -1021,12 +1021,12 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor } else { __u64 ev1, ev2; mdp_super_t *refsb = page_address(refdev->sb_page); - if (!uuid_equal(refsb, sb)) { + if (!md_uuid_equal(refsb, sb)) { pr_warn("md: %s has different UUID to %s\n", b, bdevname(refdev->bdev,b2)); goto abort; } - if (!sb_equal(refsb, sb)) { + if (!md_sb_equal(refsb, sb)) { pr_warn("md: %s has same UUID but different superblock to %s\n", b, bdevname(refdev->bdev, b2)); goto abort;