| Message ID | 20170518062705.25902-14-hch@lst.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Thu, May 18, 2017 at 08:26:55AM +0200, Christoph Hellwig wrote: > 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>
On Thu, 2017-05-18 at 08:26 +0200, Christoph Hellwig wrote: > 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(). > While patch is good, shouldn't it go before we introduce those helpers? > Cc: Shaohua Li <shli@kernel.org> > Signed-off-by: Amir Goldstein <amir73il@gmail.com> > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > 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 82f798be964f..65795cc4cb7d 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;
On Mon, May 22, 2017 at 09:52:27PM +0300, Andy Shevchenko wrote: > On Thu, 2017-05-18 at 08:26 +0200, Christoph Hellwig wrote: > > 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(). > > > > While patch is good, shouldn't it go before we introduce those helpers? Yes, I'll move it to the beginning of the series.
diff --git a/drivers/md/md.c b/drivers/md/md.c index 82f798be964f..65795cc4cb7d 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;