[PATCH] staging: lustre: fix return type of lo_release.

[PATCH] staging: lustre: fix return type of lo_release.

[Cyril Roelandt]

The return type of block_device_operations.release() changed to void in commit
db2a144b.

Found with the following Coccinelle patch:
<smpl>
@has_release_func@
identifier i;
identifier release_func;
@@
struct block_device_operations i = {
 .release = release_func
};

@depends on has_release_func@
identifier has_release_func.release_func;
@@
- int
+ void
release_func(...) {
...
- return ...;
}
</smpl>

Signed-off-by: Cyril Roelandt <tipecaml@gmail.com>
---
 drivers/staging/lustre/lustre/llite/lloop.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
index b72f257..9d4c17e 100644
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -596,15 +596,13 @@ static int lo_open(struct block_device *bdev, fmode_t mode)
 	return 0;
 }
 
-static int lo_release(struct gendisk *disk, fmode_t mode)
+static void lo_release(struct gendisk *disk, fmode_t mode)
 {
 	struct lloop_device *lo = disk->private_data;
 
 	mutex_lock(&lo->lo_ctl_mutex);
 	--lo->lo_refcnt;
 	mutex_unlock(&lo->lo_ctl_mutex);
-
-	return 0;
 }
 
 /* lloop device node's ioctl function. */
-- 
1.7.10.4

[PATCH] staging: lustre: fix return type of lo_release.

[Cyril Roelandt]

The return type of block_device_operations.release() changed to void in commit
db2a144b.

Found with the following Coccinelle patch:
<smpl>
@has_release_func@
identifier i;
identifier release_func;
@@
struct block_device_operations i = {
 .release = release_func
};

@depends on has_release_func@
identifier has_release_func.release_func;
@@
- int
+ void
release_func(...) {
...
- return ...;
}
</smpl>

Signed-off-by: Cyril Roelandt <tipecaml@gmail.com>
---
 drivers/staging/lustre/lustre/llite/lloop.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
index b72f257..9d4c17e 100644
--- a/drivers/staging/lustre/lustre/llite/lloop.c
+++ b/drivers/staging/lustre/lustre/llite/lloop.c
@@ -596,15 +596,13 @@ static int lo_open(struct block_device *bdev, fmode_t mode)
 	return 0;
 }
 
-static int lo_release(struct gendisk *disk, fmode_t mode)
+static void lo_release(struct gendisk *disk, fmode_t mode)
 {
 	struct lloop_device *lo = disk->private_data;
 
 	mutex_lock(&lo->lo_ctl_mutex);
 	--lo->lo_refcnt;
 	mutex_unlock(&lo->lo_ctl_mutex);
-
-	return 0;
 }
 
 /* lloop device node's ioctl function. */
-- 
1.7.10.4

Re: [PATCH] staging: lustre: fix return type of lo_release.

[Greg KH]

On Thu, May 16, 2013 at 06:06:20PM +0200, Cyril Roelandt wrote:
> The return type of block_device_operations.release() changed to void in commit
> db2a144b.

Interesting, how did you test build this patch, given that the driver
doesn't currently build at all?  :)

Anyway, thanks, I'll go queue this up.

greg k-h

Re: [PATCH] staging: lustre: fix return type of lo_release.

[Greg KH]

On Thu, May 16, 2013 at 06:06:20PM +0200, Cyril Roelandt wrote:
> The return type of block_device_operations.release() changed to void in commit
> db2a144b.

Interesting, how did you test build this patch, given that the driver
doesn't currently build at all?  :)

Anyway, thanks, I'll go queue this up.

greg k-h

Re: [PATCH] staging: lustre: fix return type of lo_release.

[Cyril Roelandt]

On 05/16/2013 09:01 PM, Greg KH wrote:
> On Thu, May 16, 2013 at 06:06:20PM +0200, Cyril Roelandt wrote:
>> The return type of block_device_operations.release() changed to void in commit
>> db2a144b.
>
> Interesting, how did you test build this patch, given that the driver
> doesn't currently build at all?  :)
>

Well, the patch seemed simple enough to be sent anyway :)

Cyril Roelandt.

Re: [PATCH] staging: lustre: fix return type of lo_release.

[Cyril Roelandt]

On 05/16/2013 09:01 PM, Greg KH wrote:
> On Thu, May 16, 2013 at 06:06:20PM +0200, Cyril Roelandt wrote:
>> The return type of block_device_operations.release() changed to void in commit
>> db2a144b.
>
> Interesting, how did you test build this patch, given that the driver
> doesn't currently build at all?  :)
>

Well, the patch seemed simple enough to be sent anyway :)

Cyril Roelandt.

RE: [PATCH] staging: lustre: fix return type of lo_release.

[Peng, Tao]

DQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogQ3lyaWwgUm9lbGFuZHQg
W21haWx0bzp0aXBlY2FtbEBnbWFpbC5jb21dDQo+IFNlbnQ6IEZyaWRheSwgTWF5IDE3LCAyMDEz
IDEyOjA2IEFNDQo+IFRvOiBrZXJuZWwtamFuaXRvcnNAdmdlci5rZXJuZWwub3JnOyBncmVna2hA
bGludXhmb3VuZGF0aW9uLm9yZzsgYW5kcmVhcy5kaWxnZXJAaW50ZWwuY29tOyBQZW5nLCBUYW87
DQo+IGRldmVsQGRyaXZlcmRldi5vc3Vvc2wub3JnOyBsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwu
b3JnDQo+IENjOiBDeXJpbCBSb2VsYW5kdA0KPiBTdWJqZWN0OiBbUEFUQ0hdIHN0YWdpbmc6IGx1
c3RyZTogZml4IHJldHVybiB0eXBlIG9mIGxvX3JlbGVhc2UuDQo+IA0KPiBUaGUgcmV0dXJuIHR5
cGUgb2YgYmxvY2tfZGV2aWNlX29wZXJhdGlvbnMucmVsZWFzZSgpIGNoYW5nZWQgdG8gdm9pZCBp
biBjb21taXQNCj4gZGIyYTE0NGIuDQo+IA0KPiBGb3VuZCB3aXRoIHRoZSBmb2xsb3dpbmcgQ29j
Y2luZWxsZSBwYXRjaDoNCj4gPHNtcGw+DQo+IEBoYXNfcmVsZWFzZV9mdW5jQA0KPiBpZGVudGlm
aWVyIGk7DQo+IGlkZW50aWZpZXIgcmVsZWFzZV9mdW5jOw0KPiBAQA0KPiBzdHJ1Y3QgYmxvY2tf
ZGV2aWNlX29wZXJhdGlvbnMgaSA9IHsNCj4gIC5yZWxlYXNlID0gcmVsZWFzZV9mdW5jDQo+IH07
DQo+IA0KPiBAZGVwZW5kcyBvbiBoYXNfcmVsZWFzZV9mdW5jQA0KPiBpZGVudGlmaWVyIGhhc19y
ZWxlYXNlX2Z1bmMucmVsZWFzZV9mdW5jOw0KPiBAQA0KPiAtIGludA0KPiArIHZvaWQNCj4gcmVs
ZWFzZV9mdW5jKC4uLikgew0KPiAuLi4NCj4gLSByZXR1cm4gLi4uOw0KPiB9DQo+IDwvc21wbD4N
Cj4gDQpZZWFoLCB0aGFua3MgZm9yIHRoZSBwYXRjaC4gSSBoYXZlIG9uZSBzYW1lIHBhdGNoIGJ1
dCBhbSBzdGlsbCB3b3JraW5nIG9uIHByb2NmcyBjaGFuZ2Ugc28gZGlkbid0IHNlbmQgaXQgb3V0
LiBJJ2QgYmUgZ2xhZCB0byB0YWtlIHlvdXJzIGluc3RlYWQuDQoNCkdyZWcsIHdpbGwgeW91IHRh
a2UgaXQgZGlyZWN0bHkgb3IgZG8geW91IHdhbnQgQW5kcmVhcyBhbmQgbWUgdG8gcXVldWUgaXQg
Zmlyc3Q/IFRoZSBwYXRjaCBpcyBhYnNvbHV0ZWx5IHJpZ2h0IGJ0dy4NCg0KVGhhbmtzLA0KVGFv
DQoNCj4gU2lnbmVkLW9mZi1ieTogQ3lyaWwgUm9lbGFuZHQgPHRpcGVjYW1sQGdtYWlsLmNvbT4N
Cj4gLS0tDQo+ICBkcml2ZXJzL3N0YWdpbmcvbHVzdHJlL2x1c3RyZS9sbGl0ZS9sbG9vcC5jIHwg
ICAgNCArLS0tDQo+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDMgZGVsZXRpb25z
KC0pDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL2x1c3RyZS9sdXN0cmUvbGxp
dGUvbGxvb3AuYyBiL2RyaXZlcnMvc3RhZ2luZy9sdXN0cmUvbHVzdHJlL2xsaXRlL2xsb29wLmMN
Cj4gaW5kZXggYjcyZjI1Ny4uOWQ0YzE3ZSAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9zdGFnaW5n
L2x1c3RyZS9sdXN0cmUvbGxpdGUvbGxvb3AuYw0KPiArKysgYi9kcml2ZXJzL3N0YWdpbmcvbHVz
dHJlL2x1c3RyZS9sbGl0ZS9sbG9vcC5jDQo+IEBAIC01OTYsMTUgKzU5NiwxMyBAQCBzdGF0aWMg
aW50IGxvX29wZW4oc3RydWN0IGJsb2NrX2RldmljZSAqYmRldiwgZm1vZGVfdCBtb2RlKQ0KPiAg
CXJldHVybiAwOw0KPiAgfQ0KPiANCj4gLXN0YXRpYyBpbnQgbG9fcmVsZWFzZShzdHJ1Y3QgZ2Vu
ZGlzayAqZGlzaywgZm1vZGVfdCBtb2RlKQ0KPiArc3RhdGljIHZvaWQgbG9fcmVsZWFzZShzdHJ1
Y3QgZ2VuZGlzayAqZGlzaywgZm1vZGVfdCBtb2RlKQ0KPiAgew0KPiAgCXN0cnVjdCBsbG9vcF9k
ZXZpY2UgKmxvID0gZGlzay0+cHJpdmF0ZV9kYXRhOw0KPiANCj4gIAltdXRleF9sb2NrKCZsby0+
bG9fY3RsX211dGV4KTsNCj4gIAktLWxvLT5sb19yZWZjbnQ7DQo+ICAJbXV0ZXhfdW5sb2NrKCZs
by0+bG9fY3RsX211dGV4KTsNCj4gLQ0KPiAtCXJldHVybiAwOw0KPiAgfQ0KPiANCj4gIC8qIGxs
b29wIGRldmljZSBub2RlJ3MgaW9jdGwgZnVuY3Rpb24uICovDQo+IC0tDQo+IDEuNy4xMC40DQo+
IA0KDQo

RE: [PATCH] staging: lustre: fix return type of lo_release.

[Peng, Tao]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 2146 bytes --]



> -----Original Message-----
> From: Cyril Roelandt [mailto:tipecaml@gmail.com]
> Sent: Friday, May 17, 2013 12:06 AM
> To: kernel-janitors@vger.kernel.org; gregkh@linuxfoundation.org; andreas.dilger@intel.com; Peng, Tao;
> devel@driverdev.osuosl.org; linux-kernel@vger.kernel.org
> Cc: Cyril Roelandt
> Subject: [PATCH] staging: lustre: fix return type of lo_release.
> 
> The return type of block_device_operations.release() changed to void in commit
> db2a144b.
> 
> Found with the following Coccinelle patch:
> <smpl>
> @has_release_func@
> identifier i;
> identifier release_func;
> @@
> struct block_device_operations i = {
>  .release = release_func
> };
> 
> @depends on has_release_func@
> identifier has_release_func.release_func;
> @@
> - int
> + void
> release_func(...) {
> ...
> - return ...;
> }
> </smpl>
> 
Yeah, thanks for the patch. I have one same patch but am still working on procfs change so didn't send it out. I'd be glad to take yours instead.

Greg, will you take it directly or do you want Andreas and me to queue it first? The patch is absolutely right btw.

Thanks,
Tao

> Signed-off-by: Cyril Roelandt <tipecaml@gmail.com>
> ---
>  drivers/staging/lustre/lustre/llite/lloop.c |    4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/lustre/lustre/llite/lloop.c b/drivers/staging/lustre/lustre/llite/lloop.c
> index b72f257..9d4c17e 100644
> --- a/drivers/staging/lustre/lustre/llite/lloop.c
> +++ b/drivers/staging/lustre/lustre/llite/lloop.c
> @@ -596,15 +596,13 @@ static int lo_open(struct block_device *bdev, fmode_t mode)
>  	return 0;
>  }
> 
> -static int lo_release(struct gendisk *disk, fmode_t mode)
> +static void lo_release(struct gendisk *disk, fmode_t mode)
>  {
>  	struct lloop_device *lo = disk->private_data;
> 
>  	mutex_lock(&lo->lo_ctl_mutex);
>  	--lo->lo_refcnt;
>  	mutex_unlock(&lo->lo_ctl_mutex);
> -
> -	return 0;
>  }
> 
>  /* lloop device node's ioctl function. */
> --
> 1.7.10.4
> 

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

RE: [PATCH] staging: lustre: fix return type of lo_release.

[Peng, Tao]

DQo+IC0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQo+IEZyb206IEdyZWcgS0ggW21haWx0bzpn
cmVna2hAbGludXhmb3VuZGF0aW9uLm9yZ10NCj4gU2VudDogRnJpZGF5LCBNYXkgMTcsIDIwMTMg
MzowMiBBTQ0KPiBUbzogQ3lyaWwgUm9lbGFuZHQNCj4gQ2M6IGtlcm5lbC1qYW5pdG9yc0B2Z2Vy
Lmtlcm5lbC5vcmc7IGFuZHJlYXMuZGlsZ2VyQGludGVsLmNvbTsgUGVuZywgVGFvOyBkZXZlbEBk
cml2ZXJkZXYub3N1b3NsLm9yZzsNCj4gbGludXgta2VybmVsQHZnZXIua2VybmVsLm9yZw0KPiBT
dWJqZWN0OiBSZTogW1BBVENIXSBzdGFnaW5nOiBsdXN0cmU6IGZpeCByZXR1cm4gdHlwZSBvZiBs
b19yZWxlYXNlLg0KPiANCj4gT24gVGh1LCBNYXkgMTYsIDIwMTMgYXQgMDY6MDY6MjBQTSArMDIw
MCwgQ3lyaWwgUm9lbGFuZHQgd3JvdGU6DQo+ID4gVGhlIHJldHVybiB0eXBlIG9mIGJsb2NrX2Rl
dmljZV9vcGVyYXRpb25zLnJlbGVhc2UoKSBjaGFuZ2VkIHRvIHZvaWQgaW4gY29tbWl0DQo+ID4g
ZGIyYTE0NGIuDQo+IA0KPiBJbnRlcmVzdGluZywgaG93IGRpZCB5b3UgdGVzdCBidWlsZCB0aGlz
IHBhdGNoLCBnaXZlbiB0aGF0IHRoZSBkcml2ZXINCj4gZG9lc24ndCBjdXJyZW50bHkgYnVpbGQg
YXQgYWxsPyAgOikNCj4gDQo+IEFueXdheSwgdGhhbmtzLCBJJ2xsIGdvIHF1ZXVlIHRoaXMgdXAu
DQpNeSBzdHVwaWQgZW1haWwgY2xpZW50Li4uIEp1c3Qgc2F3IHRoaXMgb25lLiBQbGVhc2UgaWdu
b3JlIG15IHByZXZpb3VzIG1haWwuIFNvcnJ5IGZvciB0aGUgbm9pc2UuDQoNClRoYW5rcywNClRh
bw0KDQoNCg=

RE: [PATCH] staging: lustre: fix return type of lo_release.

[Peng, Tao]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 942 bytes --]


> -----Original Message-----
> From: Greg KH [mailto:gregkh@linuxfoundation.org]
> Sent: Friday, May 17, 2013 3:02 AM
> To: Cyril Roelandt
> Cc: kernel-janitors@vger.kernel.org; andreas.dilger@intel.com; Peng, Tao; devel@driverdev.osuosl.org;
> linux-kernel@vger.kernel.org
> Subject: Re: [PATCH] staging: lustre: fix return type of lo_release.
> 
> On Thu, May 16, 2013 at 06:06:20PM +0200, Cyril Roelandt wrote:
> > The return type of block_device_operations.release() changed to void in commit
> > db2a144b.
> 
> Interesting, how did you test build this patch, given that the driver
> doesn't currently build at all?  :)
> 
> Anyway, thanks, I'll go queue this up.
My stupid email client... Just saw this one. Please ignore my previous mail. Sorry for the noise.

Thanks,
Tao


ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥