| Message ID | 20200505115858.1718-1-thunder.leizhen@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/1] mm: remove an unnecessary goto jump | expand |
On 05.05.20 13:58, Zhen Lei wrote: > This "goto" doesn't reduce any code, but bother the readers. "mm/page_io.c: mm: remove an unnecessary goto in generic_swapfile_activate" > > Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> > --- > mm/page_io.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/page_io.c b/mm/page_io.c > index 76965be1d40e..b1d4f4558e6b 100644 > --- a/mm/page_io.c > +++ b/mm/page_io.c > @@ -235,10 +235,10 @@ int generic_swapfile_activate(struct swap_info_struct *sis, > sis->highest_bit = page_no - 1; > out: > return ret; > + nit: I'd just not mess with newlines here. > bad_bmap: > pr_err("swapon: swapfile has holes\n"); > - ret = -EINVAL; > - goto out; > + return -EINVAL; > } > > /* > apart from that Reviewed-by: David Hildenbrand <david@redhat.com>
On 2020/5/8 16:06, David Hildenbrand wrote: > On 05.05.20 13:58, Zhen Lei wrote: >> This "goto" doesn't reduce any code, but bother the readers. > > "mm/page_io.c: mm: remove an unnecessary goto in generic_swapfile_activate" Do you mean change the subject? So is it: "mm/page_io.c: remove an unnecessary goto in generic_swapfile_activate()" ? > >> >> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> >> --- >> mm/page_io.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/mm/page_io.c b/mm/page_io.c >> index 76965be1d40e..b1d4f4558e6b 100644 >> --- a/mm/page_io.c >> +++ b/mm/page_io.c >> @@ -235,10 +235,10 @@ int generic_swapfile_activate(struct swap_info_struct *sis, >> sis->highest_bit = page_no - 1; >> out: >> return ret; >> + > > nit: I'd just not mess with newlines here. OK, I will drop it. > >> bad_bmap: >> pr_err("swapon: swapfile has holes\n"); >> - ret = -EINVAL; >> - goto out; >> + return -EINVAL; >> } >> >> /* >> > > apart from that > > Reviewed-by: David Hildenbrand <david@redhat.com> > >
On 08.05.20 10:47, Leizhen (ThunderTown) wrote: > > > On 2020/5/8 16:06, David Hildenbrand wrote: >> On 05.05.20 13:58, Zhen Lei wrote: >>> This "goto" doesn't reduce any code, but bother the readers. >> >> "mm/page_io.c: mm: remove an unnecessary goto in generic_swapfile_activate" > > Do you mean change the subject? So is it: > "mm/page_io.c: remove an unnecessary goto in generic_swapfile_activate()" ? > Yeah, would have been my suggestion.
diff --git a/mm/page_io.c b/mm/page_io.c index 76965be1d40e..b1d4f4558e6b 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -235,10 +235,10 @@ int generic_swapfile_activate(struct swap_info_struct *sis, sis->highest_bit = page_no - 1; out: return ret; + bad_bmap: pr_err("swapon: swapfile has holes\n"); - ret = -EINVAL; - goto out; + return -EINVAL; } /*
This "goto" doesn't reduce any code, but bother the readers. Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> --- mm/page_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)