2016-12-10 06:52:15

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 1/1 linux-next] xfs: remove unnecessary return

Commit f7a136aee3c1
("xfs: several xattr functions can be void")

updated 2 end of function return 0 to return in void
functions. Remove it.

Signed-off-by: Fabian Frederick <[email protected]>
---
fs/xfs/xfs_attr_list.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
index 97c45b6..5aa46c3 100644
--- a/fs/xfs/xfs_attr_list.c
+++ b/fs/xfs/xfs_attr_list.c
@@ -433,7 +433,6 @@ xfs_attr3_leaf_list_int(
cursor->offset++;
}
trace_xfs_attr_list_leaf_end(context);
- return;
}

/*
@@ -543,7 +542,6 @@ xfs_attr_put_listent(
alist->al_offset[context->count++] = context->firstu;
alist->al_count = context->count;
trace_xfs_attr_list_add(context);
- return;
}

/*
--
2.7.4


2016-12-15 04:17:05

by Eric Sandeen

[permalink] [raw]
Subject: Re: [PATCH 1/1 linux-next] xfs: remove unnecessary return

On 12/10/16 12:52 AM, Fabian Frederick wrote:
> Commit f7a136aee3c1
> ("xfs: several xattr functions can be void")
>
> updated 2 end of function return 0 to return in void
> functions. Remove it.
>
> Signed-off-by: Fabian Frederick <[email protected]>

Oh, sure. :)

Reviewed-by: Eric Sandeen <[email protected]>

> ---
> fs/xfs/xfs_attr_list.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
> index 97c45b6..5aa46c3 100644
> --- a/fs/xfs/xfs_attr_list.c
> +++ b/fs/xfs/xfs_attr_list.c
> @@ -433,7 +433,6 @@ xfs_attr3_leaf_list_int(
> cursor->offset++;
> }
> trace_xfs_attr_list_leaf_end(context);
> - return;
> }
>
> /*
> @@ -543,7 +542,6 @@ xfs_attr_put_listent(
> alist->al_offset[context->count++] = context->firstu;
> alist->al_count = context->count;
> trace_xfs_attr_list_add(context);
> - return;
> }
>
> /*
>

2016-12-15 17:53:37

by Eric Sandeen

[permalink] [raw]
Subject: Re: [PATCH 1/1 linux-next] xfs: remove unnecessary return

On 12/14/16 10:17 PM, Eric Sandeen wrote:
> On 12/10/16 12:52 AM, Fabian Frederick wrote:
>> Commit f7a136aee3c1
>> ("xfs: several xattr functions can be void")
>>
>> updated 2 end of function return 0 to return in void
>> functions. Remove it.
>>
>> Signed-off-by: Fabian Frederick <[email protected]>
>
> Oh, sure. :)
>
> Reviewed-by: Eric Sandeen <[email protected]>

On second thought, it seems to be quite common in
xfs to have a last "return;" in void functions:

# grep -n -B1 ^} fs/xfs/*.c fs/xfs/*/*.c | grep "return;" | wc -l
14

so it's really just a style issue, and probably no reason
to change it in just these 2 cases... *shrug* dchinner, take
it or leave it as you see fit. :)

-Eric

>> ---
>> fs/xfs/xfs_attr_list.c | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
>> index 97c45b6..5aa46c3 100644
>> --- a/fs/xfs/xfs_attr_list.c
>> +++ b/fs/xfs/xfs_attr_list.c
>> @@ -433,7 +433,6 @@ xfs_attr3_leaf_list_int(
>> cursor->offset++;
>> }
>> trace_xfs_attr_list_leaf_end(context);
>> - return;
>> }
>>
>> /*
>> @@ -543,7 +542,6 @@ xfs_attr_put_listent(
>> alist->al_offset[context->count++] = context->firstu;
>> alist->al_count = context->count;
>> trace_xfs_attr_list_add(context);
>> - return;
>> }
>>
>> /*
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>