> -----Original Message----- > From: Cyril Roelandt [mailto:tipecaml@xxxxxxxxx] > Sent: Friday, May 17, 2013 12:06 AM > To: kernel-janitors@xxxxxxxxxxxxxxx; gregkh@xxxxxxxxxxxxxxxxxxx; andreas.dilger@xxxxxxxxx; Peng, Tao; > devel@xxxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx > 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@xxxxxxxxx> > --- > 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��������+%������w��{.n����z�ޗ�����n�r������&��z�ޗ�zf���h���~����������_��+v���)ߣ�
