Commit 9d9a0334 authored by Miaohe Lin's avatar Miaohe Lin Committed by Linus Torvalds

mm/swapfile.c: remove unnecessary out label in __swap_duplicate()

When the code went to the out label, it must have p == NULL.  So what out
label really does is redundant if check and return err.  We should Remove
this unnecessary out label because it does not handle resource free and so
on.

Link: https://lkml.kernel.org/r/20201009130337.29698-1-linmiaohe@huawei.comSigned-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e97af699
...@@ -3445,11 +3445,11 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) ...@@ -3445,11 +3445,11 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage)
unsigned long offset; unsigned long offset;
unsigned char count; unsigned char count;
unsigned char has_cache; unsigned char has_cache;
int err = -EINVAL; int err;
p = get_swap_device(entry); p = get_swap_device(entry);
if (!p) if (!p)
goto out; return -EINVAL;
offset = swp_offset(entry); offset = swp_offset(entry);
ci = lock_cluster_or_swap_info(p, offset); ci = lock_cluster_or_swap_info(p, offset);
...@@ -3496,7 +3496,6 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) ...@@ -3496,7 +3496,6 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage)
unlock_out: unlock_out:
unlock_cluster_or_swap_info(p, ci); unlock_cluster_or_swap_info(p, ci);
out:
if (p) if (p)
put_swap_device(p); put_swap_device(p);
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment