Message ID | 20220509131416.17553-8-linmiaohe@huawei.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | A few cleanup patches for swap | expand |
On 09.05.22 15:14, Miaohe Lin wrote: > If p is NULL, __swap_duplicate will already return -EINVAL. So if we > reach here, p must be non-NULL. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: David Hildenbrand <david@redhat.com>
On Mon, May 09, 2022 at 09:14:08PM +0800, Miaohe Lin wrote: > If p is NULL, __swap_duplicate will already return -EINVAL. So if we > reach here, p must be non-NULL. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Oscar Salvador <osalvador@suse.de> > --- > mm/swapfile.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/mm/swapfile.c b/mm/swapfile.c > index d4b81ca887c0..7b4c99ca2aea 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -3336,8 +3336,7 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) > > unlock_out: > unlock_cluster_or_swap_info(p, ci); > - if (p) > - put_swap_device(p); > + put_swap_device(p); > return err; > } > > -- > 2.23.0 > >
diff --git a/mm/swapfile.c b/mm/swapfile.c index d4b81ca887c0..7b4c99ca2aea 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3336,8 +3336,7 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) unlock_out: unlock_cluster_or_swap_info(p, ci); - if (p) - put_swap_device(p); + put_swap_device(p); return err; }
If p is NULL, __swap_duplicate will already return -EINVAL. So if we reach here, p must be non-NULL. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> --- mm/swapfile.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)