ceph: remove unnecessary return in switch statement
diff mbox series

Message ID 20200814093822.GA293898@suse.de
State New
Headers show
Series
  • ceph: remove unnecessary return in switch statement
Related show

Commit Message

Luis Henriques Aug. 14, 2020, 9:38 a.m. UTC
Since there's a return immediately after the 'break', there's no need for
this extra 'return' in the S_IFDIR case.

Signed-off-by: Luis Henriques <lhenriques@suse.de>
---
 fs/ceph/file.c | 2 --
 1 file changed, 2 deletions(-)

Comments

David Laight Aug. 14, 2020, 9:52 a.m. UTC | #1
From: Luis Henriques
> Sent: 14 August 2020 10:38
> 
> Since there's a return immediately after the 'break', there's no need for
> this extra 'return' in the S_IFDIR case.
> 
> Signed-off-by: Luis Henriques <lhenriques@suse.de>
> ---
>  fs/ceph/file.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
> index d51c3f2fdca0..04ab99c0223a 100644
> --- a/fs/ceph/file.c
> +++ b/fs/ceph/file.c
> @@ -256,8 +256,6 @@ static int ceph_init_file(struct inode *inode, struct file *file, int fmode)
>  	case S_IFDIR:
>  		ret = ceph_init_file_info(inode, file, fmode,
>  						S_ISDIR(inode->i_mode));
> -		if (ret)
> -			return ret;
>  		break;
> 
>  	case S_IFLNK:

I'd move the other way and just do:
		return ceph_init_file_info(...);

	David

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)
Luis Henriques Aug. 14, 2020, 10:03 a.m. UTC | #2
David Laight <David.Laight@ACULAB.COM> writes:

> From: Luis Henriques
>> Sent: 14 August 2020 10:38
>> 
>> Since there's a return immediately after the 'break', there's no need for
>> this extra 'return' in the S_IFDIR case.
>> 
>> Signed-off-by: Luis Henriques <lhenriques@suse.de>
>> ---
>>  fs/ceph/file.c | 2 --
>>  1 file changed, 2 deletions(-)
>> 
>> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
>> index d51c3f2fdca0..04ab99c0223a 100644
>> --- a/fs/ceph/file.c
>> +++ b/fs/ceph/file.c
>> @@ -256,8 +256,6 @@ static int ceph_init_file(struct inode *inode, struct file *file, int fmode)
>>  	case S_IFDIR:
>>  		ret = ceph_init_file_info(inode, file, fmode,
>>  						S_ISDIR(inode->i_mode));
>> -		if (ret)
>> -			return ret;
>>  		break;
>> 
>>  	case S_IFLNK:
>
> I'd move the other way and just do:
> 		return ceph_init_file_info(...);

Sure, that would work too, although my preference would be to have a
single function exit point.  But I'll leave that decision to Jeff :-)

Cheers,
Jeff Layton Aug. 16, 2020, 2 p.m. UTC | #3
On Fri, 2020-08-14 at 11:03 +0100, Luis Henriques wrote:
> David Laight <David.Laight@ACULAB.COM> writes:
> 
> > From: Luis Henriques
> > > Sent: 14 August 2020 10:38
> > > 
> > > Since there's a return immediately after the 'break', there's no need for
> > > this extra 'return' in the S_IFDIR case.
> > > 
> > > Signed-off-by: Luis Henriques <lhenriques@suse.de>
> > > ---
> > >  fs/ceph/file.c | 2 --
> > >  1 file changed, 2 deletions(-)
> > > 
> > > diff --git a/fs/ceph/file.c b/fs/ceph/file.c
> > > index d51c3f2fdca0..04ab99c0223a 100644
> > > --- a/fs/ceph/file.c
> > > +++ b/fs/ceph/file.c
> > > @@ -256,8 +256,6 @@ static int ceph_init_file(struct inode *inode, struct file *file, int fmode)
> > >  	case S_IFDIR:
> > >  		ret = ceph_init_file_info(inode, file, fmode,
> > >  						S_ISDIR(inode->i_mode));
> > > -		if (ret)
> > > -			return ret;
> > >  		break;
> > > 
> > >  	case S_IFLNK:
> > 
> > I'd move the other way and just do:
> > 		return ceph_init_file_info(...);
> 
> Sure, that would work too, although my preference would be to have a
> single function exit point.  But I'll leave that decision to Jeff :-)
> 

I think I agree with Luis here (though it's really a bit subjective). I
don't think it'll matter much to the compiled result either way, and
that will probably be better if this function grows in complexity.

I'll plan to merge this patch in the next day or so.

Thanks!

Patch
diff mbox series

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index d51c3f2fdca0..04ab99c0223a 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -256,8 +256,6 @@  static int ceph_init_file(struct inode *inode, struct file *file, int fmode)
 	case S_IFDIR:
 		ret = ceph_init_file_info(inode, file, fmode,
 						S_ISDIR(inode->i_mode));
-		if (ret)
-			return ret;
 		break;
 
 	case S_IFLNK: