From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B725E21A134B8 for ; Mon, 22 May 2017 11:52:31 -0700 (PDT) Message-ID: <1495479147.6967.70.camel@linux.intel.com> Subject: Re: [PATCH 13/23] md: namespace private helper names From: Andy Shevchenko Date: Mon, 22 May 2017 21:52:27 +0300 In-Reply-To: <20170518062705.25902-14-hch@lst.de> References: <20170518062705.25902-1-hch@lst.de> <20170518062705.25902-14-hch@lst.de> Mime-Version: 1.0 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: Christoph Hellwig , Amir Goldstein , linux-fsdevel@vger.kernel.org Cc: linux-xfs@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvdimm@lists.01.org, Shaohua Li , linux-kernel@vger.kernel.org, David Howells , Mimi Zohar , Steven Whitehouse List-ID: T24gVGh1LCAyMDE3LTA1LTE4IGF0IDA4OjI2ICswMjAwLCBDaHJpc3RvcGggSGVsbHdpZyB3cm90 ZToKPiBGcm9tOiBBbWlyIEdvbGRzdGVpbiA8YW1pcjczaWxAZ21haWwuY29tPgo+IAo+IFRoZSBt ZCBwcml2YXRlIGhlbHBlciB1dWlkX2VxdWFsKCkgY29sbGlkZXMgd2l0aCBhIGdlbmVyaWMgaGVs cGVyCj4gb2YgdGhlIHNhbWUgbmFtZS4KPiAKPiBSZW5hbWUgdGhlIG1kIHByaXZhdGUgaGVscGVy IHRvIG1kX3V1aWRfZXF1YWwoKSBhbmQgZG8gdGhlIHNhbWUgZm9yCj4gbWRfc2JfZXF1YWwoKS4K PiAKCldoaWxlIHBhdGNoIGlzIGdvb2QsIHNob3VsZG4ndCBpdCBnbyBiZWZvcmUgd2UgaW50cm9k dWNlIHRob3NlIGhlbHBlcnM/Cgo+IENjOiBTaGFvaHVhIExpIDxzaGxpQGtlcm5lbC5vcmc+Cj4g U2lnbmVkLW9mZi1ieTogQW1pciBHb2xkc3RlaW4gPGFtaXI3M2lsQGdtYWlsLmNvbT4KPiBTaWdu ZWQtb2ZmLWJ5OiBDaHJpc3RvcGggSGVsbHdpZyA8aGNoQGxzdC5kZT4KPiAtLS0KPiDCoGRyaXZl cnMvbWQvbWQuYyB8IDggKysrKy0tLS0KPiDCoDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMo KyksIDQgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbWQvbWQuYyBiL2Ry aXZlcnMvbWQvbWQuYwo+IGluZGV4IDgyZjc5OGJlOTY0Zi4uNjU3OTVjYzRjYjdkIDEwMDY0NAo+ IC0tLSBhL2RyaXZlcnMvbWQvbWQuYwo+ICsrKyBiL2RyaXZlcnMvbWQvbWQuYwo+IEBAIC04MjUs NyArODI1LDcgQEAgc3RhdGljIGludCByZWFkX2Rpc2tfc2Ioc3RydWN0IG1kX3JkZXYgKnJkZXYs IGludAo+IHNpemUpCj4gwqAJcmV0dXJuIC1FSU5WQUw7Cj4gwqB9Cj4gwqAKPiAtc3RhdGljIGlu dCB1dWlkX2VxdWFsKG1kcF9zdXBlcl90ICpzYjEsIG1kcF9zdXBlcl90ICpzYjIpCj4gK3N0YXRp YyBpbnQgbWRfdXVpZF9lcXVhbChtZHBfc3VwZXJfdCAqc2IxLCBtZHBfc3VwZXJfdCAqc2IyKQo+ IMKgewo+IMKgCXJldHVybglzYjEtPnNldF91dWlkMCA9PSBzYjItPnNldF91dWlkMCAmJgo+IMKg CQlzYjEtPnNldF91dWlkMSA9PSBzYjItPnNldF91dWlkMSAmJgo+IEBAIC04MzMsNyArODMzLDcg QEAgc3RhdGljIGludCB1dWlkX2VxdWFsKG1kcF9zdXBlcl90ICpzYjEsCj4gbWRwX3N1cGVyX3Qg KnNiMikKPiDCoAkJc2IxLT5zZXRfdXVpZDMgPT0gc2IyLT5zZXRfdXVpZDM7Cj4gwqB9Cj4gwqAK PiAtc3RhdGljIGludCBzYl9lcXVhbChtZHBfc3VwZXJfdCAqc2IxLCBtZHBfc3VwZXJfdCAqc2Iy KQo+ICtzdGF0aWMgaW50IG1kX3NiX2VxdWFsKG1kcF9zdXBlcl90ICpzYjEsIG1kcF9zdXBlcl90 ICpzYjIpCj4gwqB7Cj4gwqAJaW50IHJldDsKPiDCoAltZHBfc3VwZXJfdCAqdG1wMSwgKnRtcDI7 Cj4gQEAgLTEwMjUsMTIgKzEwMjUsMTIgQEAgc3RhdGljIGludCBzdXBlcl85MF9sb2FkKHN0cnVj dCBtZF9yZGV2ICpyZGV2LAo+IHN0cnVjdCBtZF9yZGV2ICpyZWZkZXYsIGludCBtaW5vcgo+IMKg CX0gZWxzZSB7Cj4gwqAJCV9fdTY0IGV2MSwgZXYyOwo+IMKgCQltZHBfc3VwZXJfdCAqcmVmc2Ig PSBwYWdlX2FkZHJlc3MocmVmZGV2LT5zYl9wYWdlKTsKPiAtCQlpZiAoIXV1aWRfZXF1YWwocmVm c2IsIHNiKSkgewo+ICsJCWlmICghbWRfdXVpZF9lcXVhbChyZWZzYiwgc2IpKSB7Cj4gwqAJCQlw cl93YXJuKCJtZDogJXMgaGFzIGRpZmZlcmVudCBVVUlEIHRvICVzXG4iLAo+IMKgCQkJCWIsIGJk ZXZuYW1lKHJlZmRldi0+YmRldixiMikpOwo+IMKgCQkJZ290byBhYm9ydDsKPiDCoAkJfQo+IC0J CWlmICghc2JfZXF1YWwocmVmc2IsIHNiKSkgewo+ICsJCWlmICghbWRfc2JfZXF1YWwocmVmc2Is IHNiKSkgewo+IMKgCQkJcHJfd2FybigibWQ6ICVzIGhhcyBzYW1lIFVVSUQgYnV0IGRpZmZlcmVu dAo+IHN1cGVyYmxvY2sgdG8gJXNcbiIsCj4gwqAJCQkJYiwgYmRldm5hbWUocmVmZGV2LT5iZGV2 LCBiMikpOwo+IMKgCQkJZ290byBhYm9ydDsKCi0tIApBbmR5IFNoZXZjaGVua28gPGFuZHJpeS5z aGV2Y2hlbmtvQGxpbnV4LmludGVsLmNvbT4KSW50ZWwgRmlubGFuZCBPeQpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpMaW51eC1udmRpbW0gbWFpbGluZyBs aXN0CkxpbnV4LW52ZGltbUBsaXN0cy4wMS5vcmcKaHR0cHM6Ly9saXN0cy4wMS5vcmcvbWFpbG1h bi9saXN0aW5mby9saW51eC1udmRpbW0K From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: Re: [PATCH 13/23] md: namespace private helper names Date: Mon, 22 May 2017 21:52:27 +0300 Message-ID: <1495479147.6967.70.camel@linux.intel.com> References: <20170518062705.25902-1-hch@lst.de> <20170518062705.25902-14-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170518062705.25902-14-hch-jcswGhMUV9g@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org Sender: "Linux-nvdimm" To: Christoph Hellwig , Amir Goldstein , linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-xfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-raid-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org, Shaohua Li , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, David Howells , Mimi Zohar , Steven Whitehouse List-Id: linux-raid.ids T24gVGh1LCAyMDE3LTA1LTE4IGF0IDA4OjI2ICswMjAwLCBDaHJpc3RvcGggSGVsbHdpZyB3cm90 ZToKPiBGcm9tOiBBbWlyIEdvbGRzdGVpbiA8YW1pcjczaWxAZ21haWwuY29tPgo+IAo+IFRoZSBt ZCBwcml2YXRlIGhlbHBlciB1dWlkX2VxdWFsKCkgY29sbGlkZXMgd2l0aCBhIGdlbmVyaWMgaGVs cGVyCj4gb2YgdGhlIHNhbWUgbmFtZS4KPiAKPiBSZW5hbWUgdGhlIG1kIHByaXZhdGUgaGVscGVy IHRvIG1kX3V1aWRfZXF1YWwoKSBhbmQgZG8gdGhlIHNhbWUgZm9yCj4gbWRfc2JfZXF1YWwoKS4K PiAKCldoaWxlIHBhdGNoIGlzIGdvb2QsIHNob3VsZG4ndCBpdCBnbyBiZWZvcmUgd2UgaW50cm9k dWNlIHRob3NlIGhlbHBlcnM/Cgo+IENjOiBTaGFvaHVhIExpIDxzaGxpQGtlcm5lbC5vcmc+Cj4g U2lnbmVkLW9mZi1ieTogQW1pciBHb2xkc3RlaW4gPGFtaXI3M2lsQGdtYWlsLmNvbT4KPiBTaWdu ZWQtb2ZmLWJ5OiBDaHJpc3RvcGggSGVsbHdpZyA8aGNoQGxzdC5kZT4KPiAtLS0KPiDCoGRyaXZl cnMvbWQvbWQuYyB8IDggKysrKy0tLS0KPiDCoDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMo KyksIDQgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbWQvbWQuYyBiL2Ry aXZlcnMvbWQvbWQuYwo+IGluZGV4IDgyZjc5OGJlOTY0Zi4uNjU3OTVjYzRjYjdkIDEwMDY0NAo+ IC0tLSBhL2RyaXZlcnMvbWQvbWQuYwo+ICsrKyBiL2RyaXZlcnMvbWQvbWQuYwo+IEBAIC04MjUs NyArODI1LDcgQEAgc3RhdGljIGludCByZWFkX2Rpc2tfc2Ioc3RydWN0IG1kX3JkZXYgKnJkZXYs IGludAo+IHNpemUpCj4gwqAJcmV0dXJuIC1FSU5WQUw7Cj4gwqB9Cj4gwqAKPiAtc3RhdGljIGlu dCB1dWlkX2VxdWFsKG1kcF9zdXBlcl90ICpzYjEsIG1kcF9zdXBlcl90ICpzYjIpCj4gK3N0YXRp YyBpbnQgbWRfdXVpZF9lcXVhbChtZHBfc3VwZXJfdCAqc2IxLCBtZHBfc3VwZXJfdCAqc2IyKQo+ IMKgewo+IMKgCXJldHVybglzYjEtPnNldF91dWlkMCA9PSBzYjItPnNldF91dWlkMCAmJgo+IMKg CQlzYjEtPnNldF91dWlkMSA9PSBzYjItPnNldF91dWlkMSAmJgo+IEBAIC04MzMsNyArODMzLDcg QEAgc3RhdGljIGludCB1dWlkX2VxdWFsKG1kcF9zdXBlcl90ICpzYjEsCj4gbWRwX3N1cGVyX3Qg KnNiMikKPiDCoAkJc2IxLT5zZXRfdXVpZDMgPT0gc2IyLT5zZXRfdXVpZDM7Cj4gwqB9Cj4gwqAK PiAtc3RhdGljIGludCBzYl9lcXVhbChtZHBfc3VwZXJfdCAqc2IxLCBtZHBfc3VwZXJfdCAqc2Iy KQo+ICtzdGF0aWMgaW50IG1kX3NiX2VxdWFsKG1kcF9zdXBlcl90ICpzYjEsIG1kcF9zdXBlcl90 ICpzYjIpCj4gwqB7Cj4gwqAJaW50IHJldDsKPiDCoAltZHBfc3VwZXJfdCAqdG1wMSwgKnRtcDI7 Cj4gQEAgLTEwMjUsMTIgKzEwMjUsMTIgQEAgc3RhdGljIGludCBzdXBlcl85MF9sb2FkKHN0cnVj dCBtZF9yZGV2ICpyZGV2LAo+IHN0cnVjdCBtZF9yZGV2ICpyZWZkZXYsIGludCBtaW5vcgo+IMKg CX0gZWxzZSB7Cj4gwqAJCV9fdTY0IGV2MSwgZXYyOwo+IMKgCQltZHBfc3VwZXJfdCAqcmVmc2Ig PSBwYWdlX2FkZHJlc3MocmVmZGV2LT5zYl9wYWdlKTsKPiAtCQlpZiAoIXV1aWRfZXF1YWwocmVm c2IsIHNiKSkgewo+ICsJCWlmICghbWRfdXVpZF9lcXVhbChyZWZzYiwgc2IpKSB7Cj4gwqAJCQlw cl93YXJuKCJtZDogJXMgaGFzIGRpZmZlcmVudCBVVUlEIHRvICVzXG4iLAo+IMKgCQkJCWIsIGJk ZXZuYW1lKHJlZmRldi0+YmRldixiMikpOwo+IMKgCQkJZ290byBhYm9ydDsKPiDCoAkJfQo+IC0J CWlmICghc2JfZXF1YWwocmVmc2IsIHNiKSkgewo+ICsJCWlmICghbWRfc2JfZXF1YWwocmVmc2Is IHNiKSkgewo+IMKgCQkJcHJfd2FybigibWQ6ICVzIGhhcyBzYW1lIFVVSUQgYnV0IGRpZmZlcmVu dAo+IHN1cGVyYmxvY2sgdG8gJXNcbiIsCj4gwqAJCQkJYiwgYmRldm5hbWUocmVmZGV2LT5iZGV2 LCBiMikpOwo+IMKgCQkJZ290byBhYm9ydDsKCi0tIApBbmR5IFNoZXZjaGVua28gPGFuZHJpeS5z aGV2Y2hlbmtvQGxpbnV4LmludGVsLmNvbT4KSW50ZWwgRmlubGFuZCBPeQpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpMaW51eC1udmRpbW0gbWFpbGluZyBs aXN0CkxpbnV4LW52ZGltbUBsaXN0cy4wMS5vcmcKaHR0cHM6Ly9saXN0cy4wMS5vcmcvbWFpbG1h bi9saXN0aW5mby9saW51eC1udmRpbW0K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com ([192.55.52.93]:30199 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761033AbdEVSwc (ORCPT ); Mon, 22 May 2017 14:52:32 -0400 Message-ID: <1495479147.6967.70.camel@linux.intel.com> Subject: Re: [PATCH 13/23] md: namespace private helper names From: Andy Shevchenko Date: Mon, 22 May 2017 21:52:27 +0300 In-Reply-To: <20170518062705.25902-14-hch@lst.de> References: <20170518062705.25902-1-hch@lst.de> <20170518062705.25902-14-hch@lst.de> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: Christoph Hellwig , Amir Goldstein , linux-fsdevel@vger.kernel.org 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 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761089AbdEVSwg (ORCPT ); Mon, 22 May 2017 14:52:36 -0400 Received: from mga11.intel.com ([192.55.52.93]:30199 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761033AbdEVSwc (ORCPT ); Mon, 22 May 2017 14:52:32 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,378,1491289200"; d="scan'208";a="265029478" Message-ID: <1495479147.6967.70.camel@linux.intel.com> Subject: Re: [PATCH 13/23] md: namespace private helper names From: Andy Shevchenko To: Christoph Hellwig , Amir Goldstein , linux-fsdevel@vger.kernel.org Cc: Shaohua Li , Dan Williams , David Howells , Steven Whitehouse , Mimi Zohar , linux-xfs@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvdimm@ml01.01.org, linux-kernel@vger.kernel.org Date: Mon, 22 May 2017 21:52:27 +0300 In-Reply-To: <20170518062705.25902-14-hch@lst.de> References: <20170518062705.25902-1-hch@lst.de> <20170518062705.25902-14-hch@lst.de> 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: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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