From: Amir Goldstein <amir73il@gmail.com>
To: "Darrick J . Wong" <darrick.wong@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
Miklos Szeredi <miklos@szeredi.hu>, Theodore Tso <tytso@mit.edu>,
Richard Weinberger <richard@nod.at>,
Mark Fasheh <mfasheh@versity.com>,
Dan Williams <dan.j.williams@intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
David Howells <dhowells@redhat.com>, Shaohua Li <shli@kernel.org>,
Al Viro <viro@zeniv.linux.org.uk>,
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 [thread overview]
Message-ID: <1493904383-2187-6-git-send-email-amir73il@gmail.com> (raw)
In-Reply-To: <1493904383-2187-1-git-send-email-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().
Cc: Shaohua Li <shli@kernel.org>
Signed-off-by: Amir Goldstein <amir73il@gmail.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 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;
--
2.7.4
next prev parent reply other threads:[~2017-05-04 13:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-04 13:26 [PATCH v2 0/8] hoist uuid helpers from xfs to linux/uuid.h Amir Goldstein
2017-05-04 13:26 ` [PATCH v2 1/8] xfs: use uuid_copy() helper to abstract uuid_t Amir Goldstein
2017-05-04 13:31 ` Christoph Hellwig
2017-05-04 13:26 ` [PATCH v2 2/8] xfs: re-define uuid_t as common struct uuid_v1 Amir Goldstein
2017-05-04 13:34 ` Christoph Hellwig
2017-05-04 13:57 ` Amir Goldstein
2017-05-04 13:59 ` Christoph Hellwig
2017-05-04 14:00 ` Amir Goldstein
2017-05-04 14:01 ` Christoph Hellwig
2017-05-04 14:16 ` David Howells
2017-05-04 14:18 ` Christoph Hellwig
2017-05-04 14:36 ` David Howells
2017-05-04 13:26 ` [PATCH v2 3/8] xfs: dismiss xfs_uu_t Amir Goldstein
2017-05-04 13:35 ` Christoph Hellwig
2017-05-04 13:26 ` [PATCH v2 4/8] xfs: namespace the helper uuid_getnodeuniq() Amir Goldstein
2017-05-04 13:28 ` Christoph Hellwig
2017-05-04 13:26 ` Amir Goldstein [this message]
2017-05-04 13:26 ` [PATCH v2 6/8] linux/uuid.h: hoist helpers uuid_equal() and uuid_copy() from xfs Amir Goldstein
2017-05-04 13:26 ` [PATCH v2 7/8] linux/uuid.h: hoist uuid_is_null() helper from libnvdimm Amir Goldstein
2017-05-04 13:30 ` Christoph Hellwig
2017-05-04 13:26 ` [PATCH v2 8/8] xfs: use the common helper uuid_is_null() Amir Goldstein
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=1493904383-2187-6-git-send-email-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dan.j.williams@intel.com \
--cc=darrick.wong@oracle.com \
--cc=dhowells@redhat.com \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=mfasheh@versity.com \
--cc=miklos@szeredi.hu \
--cc=richard@nod.at \
--cc=shli@kernel.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/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).