md: namespace private helper names
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>
This commit is contained in:
Родитель
b1f359f980
Коммит
e6fd2093a8
|
@ -825,7 +825,7 @@ fail:
|
|||
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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче