diff mbox

NFS: fix the return value of nfs4_blkdev_get()

Message ID CAPgLHd__m_A5gqBP1GgUJb=_fib7bOiJunVoNZn2HCiKyXVjrw@mail.gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Yongjun Sept. 25, 2012, 5:43 a.m. UTC 
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

In case of error, the function nfs4_blkdev_get() return NULL pointer.
But the user nfs4_blk_decode_device() check the return value by using
IS_ERR() and get error code from the return value. So we should better
change the return value of nfs4_blkdev_get() to return ERR_PTR().

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 fs/nfs/blocklayout/blocklayoutdev.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

tao.peng@emc.com Sept. 25, 2012, 7:11 a.m. UTC | #1 
PiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBsaW51eC1uZnMtb3duZXJAdmdl
ci5rZXJuZWwub3JnIFttYWlsdG86bGludXgtbmZzLW93bmVyQHZnZXIua2VybmVsLm9yZ10gT24g
QmVoYWxmIE9mIFdlaQ0KPiBZb25nanVuDQo+IFNlbnQ6IFR1ZXNkYXksIFNlcHRlbWJlciAyNSwg
MjAxMiAxOjQ0IFBNDQo+IFRvOiBUcm9uZC5NeWtsZWJ1c3RAbmV0YXBwLmNvbQ0KPiBDYzogeW9u
Z2p1bl93ZWlAdHJlbmRtaWNyby5jb20uY247IGxpbnV4LW5mc0B2Z2VyLmtlcm5lbC5vcmcNCj4g
U3ViamVjdDogW1BBVENIXSBORlM6IGZpeCB0aGUgcmV0dXJuIHZhbHVlIG9mIG5mczRfYmxrZGV2
X2dldCgpDQo+IA0KPiBGcm9tOiBXZWkgWW9uZ2p1biA8eW9uZ2p1bl93ZWlAdHJlbmRtaWNyby5j
b20uY24+DQo+IA0KPiBJbiBjYXNlIG9mIGVycm9yLCB0aGUgZnVuY3Rpb24gbmZzNF9ibGtkZXZf
Z2V0KCkgcmV0dXJuIE5VTEwgcG9pbnRlci4NCj4gQnV0IHRoZSB1c2VyIG5mczRfYmxrX2RlY29k
ZV9kZXZpY2UoKSBjaGVjayB0aGUgcmV0dXJuIHZhbHVlIGJ5IHVzaW5nDQo+IElTX0VSUigpIGFu
ZCBnZXQgZXJyb3IgY29kZSBmcm9tIHRoZSByZXR1cm4gdmFsdWUuIFNvIHdlIHNob3VsZCBiZXR0
ZXINCj4gY2hhbmdlIHRoZSByZXR1cm4gdmFsdWUgb2YgbmZzNF9ibGtkZXZfZ2V0KCkgdG8gcmV0
dXJuIEVSUl9QVFIoKS4NCj4gDQpZZWFoLCBpdCBpcyBtZXJlbHkgbWVzcyBhbmQgc2hvdWxkIGJl
IGp1c3QgcmVtb3ZlZC4uLiBIb3cgYWJvdXQgZm9sbG93aW5nIHBhdGNoPw0KDQpGcm9tIGUyNjhm
MWE1OTEzYjAwNWQxMGVlZGI4MmI0ZDUzNTIxZDU2ZDYyMWUgTW9uIFNlcCAxNyAwMDowMDowMCAy
MDAxDQpGcm9tOiBQZW5nIFRhbyA8YmVyZ3dvbGZAZ21haWwuY29tPg0KRGF0ZTogVHVlLCAyNSBT
ZXAgMjAxMiAxNDo1NTo1NyArMDgwMA0KU3ViamVjdDogW1BBVENIXSBwbmZzYmxvY2s6IGNsZWFu
dXAgbmZzNF9ibGtkZXZfZ2V0DQoNCkl0IGlzIG5vdCBuZWVkZWQgYXQgYWxsIGFuZCBpdCBpcyBt
ZXNzaW5nIHdpdGggcmV0dXJuIHZhbHVlcy4uLg0KDQpSZXBvcnRlZC1ieTogV2VpIFlvbmdqdW4g
PHlvbmdqdW5fd2VpQHRyZW5kbWljcm8uY29tLmNuPg0KU2lnbmVkLW9mZi1ieTogUGVuZyBUYW8g
PHRhby5wZW5nQGVtYy5jb20+DQotLS0NCiBmcy9uZnMvYmxvY2tsYXlvdXQvYmxvY2tsYXlvdXQu
aCAgICB8ICAgIDEgLQ0KIGZzL25mcy9ibG9ja2xheW91dC9ibG9ja2xheW91dGRldi5jIHwgICAy
NSArKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tDQogMiBmaWxlcyBjaGFuZ2VkLCA1IGluc2VydGlv
bnMoKyksIDIxIGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvZnMvbmZzL2Jsb2NrbGF5b3V0
L2Jsb2NrbGF5b3V0LmggYi9mcy9uZnMvYmxvY2tsYXlvdXQvYmxvY2tsYXlvdXQuaA0KaW5kZXgg
MDMzNTA2OS4uZWQ5NmY3NCAxMDA2NDQNCi0tLSBhL2ZzL25mcy9ibG9ja2xheW91dC9ibG9ja2xh
eW91dC5oDQorKysgYi9mcy9uZnMvYmxvY2tsYXlvdXQvYmxvY2tsYXlvdXQuaA0KQEAgLTE3Miw3
ICsxNzIsNiBAQCBzdHJ1Y3QgYmxfbXNnX2hkciB7DQogLyogYmxvY2tsYXlvdXRkZXYuYyAqLw0K
IHNzaXplX3QgYmxfcGlwZV9kb3duY2FsbChzdHJ1Y3QgZmlsZSAqLCBjb25zdCBjaGFyIF9fdXNl
ciAqLCBzaXplX3QpOw0KIHZvaWQgYmxfcGlwZV9kZXN0cm95X21zZyhzdHJ1Y3QgcnBjX3BpcGVf
bXNnICopOw0KLXN0cnVjdCBibG9ja19kZXZpY2UgKm5mczRfYmxrZGV2X2dldChkZXZfdCBkZXYp
Ow0KIGludCBuZnM0X2Jsa2Rldl9wdXQoc3RydWN0IGJsb2NrX2RldmljZSAqYmRldik7DQogc3Ry
dWN0IHBuZnNfYmxvY2tfZGV2ICpuZnM0X2Jsa19kZWNvZGVfZGV2aWNlKHN0cnVjdCBuZnNfc2Vy
dmVyICpzZXJ2ZXIsDQogCQkJCQkJc3RydWN0IHBuZnNfZGV2aWNlICpkZXYpOw0KZGlmZiAtLWdp
dCBhL2ZzL25mcy9ibG9ja2xheW91dC9ibG9ja2xheW91dGRldi5jIGIvZnMvbmZzL2Jsb2NrbGF5
b3V0L2Jsb2NrbGF5b3V0ZGV2LmMNCmluZGV4IGM5NjU1NDIuLmE4NmM1YmQgMTAwNjQ0DQotLS0g
YS9mcy9uZnMvYmxvY2tsYXlvdXQvYmxvY2tsYXlvdXRkZXYuYw0KKysrIGIvZnMvbmZzL2Jsb2Nr
bGF5b3V0L2Jsb2NrbGF5b3V0ZGV2LmMNCkBAIC01MywyMiArNTMsNiBAQCBzdGF0aWMgaW50IGRl
Y29kZV9zZWN0b3JfbnVtYmVyKF9fYmUzMiAqKnJwLCBzZWN0b3JfdCAqc3ApDQogCXJldHVybiAw
Ow0KIH0NCiANCi0vKiBPcGVuIGEgYmxvY2tfZGV2aWNlIGJ5IGRldmljZSBudW1iZXIuICovDQot
c3RydWN0IGJsb2NrX2RldmljZSAqbmZzNF9ibGtkZXZfZ2V0KGRldl90IGRldikNCi17DQotCXN0
cnVjdCBibG9ja19kZXZpY2UgKmJkOw0KLQ0KLQlkcHJpbnRrKCIlcyBlbnRlclxuIiwgX19mdW5j
X18pOw0KLQliZCA9IGJsa2Rldl9nZXRfYnlfZGV2KGRldiwgRk1PREVfUkVBRCwgTlVMTCk7DQot
CWlmIChJU19FUlIoYmQpKQ0KLQkJZ290byBmYWlsOw0KLQlyZXR1cm4gYmQ7DQotZmFpbDoNCi0J
ZHByaW50aygiJXMgZmFpbGVkIHRvIG9wZW4gZGV2aWNlIDogJWxkXG4iLA0KLQkJCV9fZnVuY19f
LCBQVFJfRVJSKGJkKSk7DQotCXJldHVybiBOVUxMOw0KLX0NCi0NCiAvKg0KICAqIFJlbGVhc2Ug
dGhlIGJsb2NrIGRldmljZQ0KICAqLw0KQEAgLTE3MiwxMSArMTU2LDEyIEBAIG5mczRfYmxrX2Rl
Y29kZV9kZXZpY2Uoc3RydWN0IG5mc19zZXJ2ZXIgKnNlcnZlciwNCiAJCWdvdG8gb3V0Ow0KIAl9
DQogDQotCWJkID0gbmZzNF9ibGtkZXZfZ2V0KE1LREVWKHJlcGx5LT5tYWpvciwgcmVwbHktPm1p
bm9yKSk7DQorCWJkID0gYmxrZGV2X2dldF9ieV9kZXYoTUtERVYocmVwbHktPm1ham9yLCByZXBs
eS0+bWlub3IpLA0KKwkJCSAgICAgICBGTU9ERV9SRUFELCBOVUxMKTsNCiAJaWYgKElTX0VSUihi
ZCkpIHsNCi0JCXJjID0gUFRSX0VSUihiZCk7DQotCQlkcHJpbnRrKCIlcyBmYWlsZWQgdG8gb3Bl
biBkZXZpY2UgOiAlZFxuIiwgX19mdW5jX18sIHJjKTsNCi0JCXJ2ID0gRVJSX1BUUihyYyk7DQor
CQlkcHJpbnRrKCIlcyBmYWlsZWQgdG8gb3BlbiBkZXZpY2UgOiAlbGRcbiIsIF9fZnVuY19fLA0K
KwkJCVBUUl9FUlIoYmQpKTsNCisJCXJ2ID0gRVJSX0NBU1QoYmQpOw0KIAkJZ290byBvdXQ7DQog
CX0NCiANCi0tIA0KMS43LjcuNg0KDQoNCg0K
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
yongjun_wei@trendmicro.com.cn Sept. 25, 2012, 7:59 a.m. UTC | #2 
-----Original Message-----
From: Peng, Tao [mailto:tao.peng@emc.com] 

Sent: 2012?9?25? 15:12
To: Wei Yongjun; Trond.Myklebust@netapp.com
Cc: Yongjun Wei (RD-CN); linux-nfs@vger.kernel.org
Subject: RE: [PATCH] NFS: fix the return value of nfs4_blkdev_get()

> -----Original Message-----

> From: linux-nfs-owner@vger.kernel.org 

> [mailto:linux-nfs-owner@vger.kernel.org] On Behalf Of Wei Yongjun

> Sent: Tuesday, September 25, 2012 1:44 PM

> To: Trond.Myklebust@netapp.com

> Cc: yongjun_wei@trendmicro.com.cn; linux-nfs@vger.kernel.org

> Subject: [PATCH] NFS: fix the return value of nfs4_blkdev_get()

> 

> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

> 

> In case of error, the function nfs4_blkdev_get() return NULL pointer.

> But the user nfs4_blk_decode_device() check the return value by using

> IS_ERR() and get error code from the return value. So we should better 

> change the return value of nfs4_blkdev_get() to return ERR_PTR().

> 

Yeah, it is merely mess and should be just removed... How about following patch?

It is OK to me.

Regards,
Yongjun Wei



TREND MICRO EMAIL NOTICE
The information contained in this email and any attachments is confidential and may be subject to copyright or other intellectual property protection. If you are not the intended recipient, you are not authorized to use or disclose this information, and we request that you notify us by reply mail or telephone and delete the original message from your mail system.
Jim Rees Sept. 25, 2012, 12:46 p.m. UTC | #3 
Peng, Tao wrote:

  > -----Original Message-----
  > From: linux-nfs-owner@vger.kernel.org [mailto:linux-nfs-owner@vger.kernel.org] On Behalf Of Wei
  > Yongjun
  > Sent: Tuesday, September 25, 2012 1:44 PM
  > To: Trond.Myklebust@netapp.com
  > Cc: yongjun_wei@trendmicro.com.cn; linux-nfs@vger.kernel.org
  > Subject: [PATCH] NFS: fix the return value of nfs4_blkdev_get()
  > 
  > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
  > 
  > In case of error, the function nfs4_blkdev_get() return NULL pointer.
  > But the user nfs4_blk_decode_device() check the return value by using
  > IS_ERR() and get error code from the return value. So we should better
  > change the return value of nfs4_blkdev_get() to return ERR_PTR().
  > 
  Yeah, it is merely mess and should be just removed...

It's leftover debug code. Get rid of it.
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/nfs/blocklayout/blocklayoutdev.c b/fs/nfs/blocklayout/blocklayoutdev.c
index c965542..8c51518 100644
--- a/fs/nfs/blocklayout/blocklayoutdev.c
+++ b/fs/nfs/blocklayout/blocklayoutdev.c
@@ -61,12 +61,9 @@  struct block_device *nfs4_blkdev_get(dev_t dev)
 	dprintk("%s enter\n", __func__);
 	bd = blkdev_get_by_dev(dev, FMODE_READ, NULL);
 	if (IS_ERR(bd))
-		goto fail;
+		dprintk("%s failed to open device : %ld\n",
+				__func__, PTR_ERR(bd));
 	return bd;
-fail:
-	dprintk("%s failed to open device : %ld\n",
-			__func__, PTR_ERR(bd));
-	return NULL;
 }
 
 /*