From: Christoph Hellwig <hch@lst.de>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Amir Goldstein <amir73il@gmail.com>,
linux-fsdevel@vger.kernel.org
Cc: Shaohua Li <shli@kernel.org>,
Dan Williams <dan.j.williams@intel.com>,
David Howells <dhowells@redhat.com>,
Steven Whitehouse <swhiteho@redhat.com>,
Mimi Zohar <zohar@linux.vnet.ibm.com>,
linux-xfs@vger.kernel.org, linux-raid@vger.kernel.org,
linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org,
linux-block@vger.kernel.org
Subject: [PATCH 04/24] md: namespace private helper names
Date: Wed, 31 May 2017 18:18:06 +0200 [thread overview]
Message-ID: <20170531161826.23243-5-hch@lst.de> (raw)
In-Reply-To: <20170531161826.23243-1-hch@lst.de>
From: Amir Goldstein <amir73il@gmail.com>
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().
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Shaohua Li <shli@kernel.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
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 10367ffe92e3..b9ab268ba7f9 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -825,7 +825,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 &&
@@ -833,7 +833,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;
@@ -1025,12 +1025,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;
--
2.11.0
next prev parent reply other threads:[~2017-05-31 16:18 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-31 16:18 cleanup UUID types V6 Christoph Hellwig
2017-05-31 16:18 ` [PATCH 01/24] uuid,afs: move struct uuid_v1 back into afs Christoph Hellwig
2017-05-31 16:18 ` [PATCH 02/24] xfs: use uuid_copy() helper to abstract uuid_t Christoph Hellwig
2017-05-31 16:18 ` [PATCH 03/24] xfs: use uuid_be to implement the uuid_t type Christoph Hellwig
2017-05-31 16:18 ` Christoph Hellwig [this message]
2017-05-31 16:18 ` [PATCH 05/24] uuid: remove uuid_be defintions from the uapi header Christoph Hellwig
2017-05-31 16:18 ` [PATCH 06/24] uuid: rename uuid types Christoph Hellwig
2017-05-31 16:18 ` [PATCH 07/24] nfsd: namespace-prefix uuid_parse Christoph Hellwig
2017-05-31 16:18 ` [PATCH 08/24] uuid: rename uuid_to_bin to uuid_parse Christoph Hellwig
2017-05-31 18:14 ` Andy Shevchenko
2017-05-31 19:40 ` Christoph Hellwig
2017-05-31 16:18 ` [PATCH 09/24] uuid: don't export guid_index and uuid_index Christoph Hellwig
2017-05-31 16:18 ` [PATCH 10/24] uuid: hoist helpers uuid_equal() and uuid_copy() from xfs Christoph Hellwig
2017-05-31 16:18 ` [PATCH 11/24] uuid: hoist uuid_is_null() helper from libnvdimm Christoph Hellwig
2017-05-31 16:18 ` [PATCH 12/24] S390/sysinfo: use uuid_is_null instead of opencoding it Christoph Hellwig
2017-05-31 16:18 ` [PATCH 13/24] xfs: remove uuid_getnodeuniq and xfs_uu_t Christoph Hellwig
2017-05-31 16:18 ` [PATCH 14/24] xfs: use the common helper uuid_is_null() Christoph Hellwig
2017-05-31 16:18 ` [PATCH 15/24] block: remove blk_part_pack_uuid Christoph Hellwig
2017-05-31 18:16 ` Andy Shevchenko
2017-05-31 19:39 ` Christoph Hellwig
2017-05-31 16:18 ` [PATCH 16/24] ima/policy: switch to use uuid_t Christoph Hellwig
2017-05-31 16:18 ` [PATCH 17/24] fs: switch ->s_uuid to uuid_t Christoph Hellwig
2017-05-31 16:18 ` [PATCH 18/24] overlayfs: use uuid_t instead of uuid_be Christoph Hellwig
2017-05-31 16:18 ` [PATCH 19/24] partitions/ldm: switch to use uuid_t Christoph Hellwig
2017-05-31 16:18 ` [PATCH 20/24] sysctl: " Christoph Hellwig
2017-05-31 16:18 ` [PATCH 21/24] nvme: switch to uuid_t Christoph Hellwig
2017-05-31 16:18 ` [PATCH 22/24] scsi_debug: " Christoph Hellwig
2017-05-31 16:18 ` [PATCH 23/24] tmpfs: generate random sb->s_uuid Christoph Hellwig
2017-05-31 16:18 ` [PATCH 24/24] MAINTAINERS: add uuid entry Christoph Hellwig
2017-05-31 18:25 ` [PATCH 01/24] uuid,afs: move struct uuid_v1 back into afs David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170531161826.23243-5-hch@lst.de \
--to=hch@lst.de \
--cc=amir73il@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dan.j.williams@intel.com \
--cc=dhowells@redhat.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=shli@kernel.org \
--cc=swhiteho@redhat.com \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).