Path: csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: Andy Shevchenko Newsgroups: linux.kernel Subject: Re: [PATCH 13/23] md: namespace private helper names Date: Mon, 22 May 2017 21:00:02 +0200 Message-ID: References: X-Original-To: Christoph Hellwig , Amir Goldstein , linux-fsdevel@vger.kernel.org X-Extloop1: 1 X-Ironport-Av: E=Sophos;i="5.38,378,1491289200"; d="scan'208";a="265029478" Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6-1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 64 X-Original-Cc: Shaohua Li , Dan Williams , David Howells , Steven Whitehouse , Mimi Zohar , linux-xfs@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org X-Original-Date: Mon, 22 May 2017 21:52:27 +0300 X-Original-Message-ID: <1495479147.6967.70.camel@linux.intel.com> X-Original-References: <20170518062705.25902-1-hch@lst.de> <20170518062705.25902-14-hch@lst.de> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1647268 On Thu, 2017-05-18 at 08:26 +0200, Christoph Hellwig wrote: > From: Amir Goldstein > > 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 > Signed-off-by: Amir Goldstein > Signed-off-by: Christoph Hellwig > --- >  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; -- Andy Shevchenko Intel Finland Oy