diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-06-13 11:45:14 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2017-06-13 11:45:14 +0200 |
| commit | fdd050b5b3c96813ae6756ed68157d32ba31b9f2 (patch) | |
| tree | ca1a216730e32471cd17886d9de1902228bc340c /drivers/md/md.c | |
| parent | blk-mq: fixup type of 'ret' in __blk_mq_try_issue_directly() (diff) | |
| parent | thermal: int340x_thermal: fix compile after the UUID API switch (diff) | |
| download | linux-fdd050b5b3c96813ae6756ed68157d32ba31b9f2.tar.xz linux-fdd050b5b3c96813ae6756ed68157d32ba31b9f2.zip | |
Merge branch 'uuid-types' of bombadil.infradead.org:public_git/uuid into nvme-base
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 833cc7082034..6d493b54d56c 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -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; |