| Message ID | 20220509131416.17553-5-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: > The return value of free_swap_slot is always 0 and also ignored now. > Remove it to clean up the code. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: David Hildenbrand <david@redhat.com>
On Mon, May 09, 2022 at 09:14:05PM +0800, Miaohe Lin wrote: > The return value of free_swap_slot is always 0 and also ignored now. > Remove it to clean up the code. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Oscar Salvador <osalvador@suse.de> > --- > include/linux/swap_slots.h | 2 +- > mm/swap_slots.c | 4 +--- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/include/linux/swap_slots.h b/include/linux/swap_slots.h > index 347f1a304190..15adfb8c813a 100644 > --- a/include/linux/swap_slots.h > +++ b/include/linux/swap_slots.h > @@ -24,7 +24,7 @@ struct swap_slots_cache { > void disable_swap_slots_cache_lock(void); > void reenable_swap_slots_cache_unlock(void); > void enable_swap_slots_cache(void); > -int free_swap_slot(swp_entry_t entry); > +void free_swap_slot(swp_entry_t entry); > > extern bool swap_slot_cache_enabled; > > diff --git a/mm/swap_slots.c b/mm/swap_slots.c > index 0218ec1cd24c..2f877e6f87d7 100644 > --- a/mm/swap_slots.c > +++ b/mm/swap_slots.c > @@ -269,7 +269,7 @@ static int refill_swap_slots_cache(struct swap_slots_cache *cache) > return cache->nr; > } > > -int free_swap_slot(swp_entry_t entry) > +void free_swap_slot(swp_entry_t entry) > { > struct swap_slots_cache *cache; > > @@ -297,8 +297,6 @@ int free_swap_slot(swp_entry_t entry) > direct_free: > swapcache_free_entries(&entry, 1); > } > - > - return 0; > } > > swp_entry_t folio_alloc_swap(struct folio *folio) > -- > 2.23.0 > >
diff --git a/include/linux/swap_slots.h b/include/linux/swap_slots.h index 347f1a304190..15adfb8c813a 100644 --- a/include/linux/swap_slots.h +++ b/include/linux/swap_slots.h @@ -24,7 +24,7 @@ struct swap_slots_cache { void disable_swap_slots_cache_lock(void); void reenable_swap_slots_cache_unlock(void); void enable_swap_slots_cache(void); -int free_swap_slot(swp_entry_t entry); +void free_swap_slot(swp_entry_t entry); extern bool swap_slot_cache_enabled; diff --git a/mm/swap_slots.c b/mm/swap_slots.c index 0218ec1cd24c..2f877e6f87d7 100644 --- a/mm/swap_slots.c +++ b/mm/swap_slots.c @@ -269,7 +269,7 @@ static int refill_swap_slots_cache(struct swap_slots_cache *cache) return cache->nr; } -int free_swap_slot(swp_entry_t entry) +void free_swap_slot(swp_entry_t entry) { struct swap_slots_cache *cache; @@ -297,8 +297,6 @@ int free_swap_slot(swp_entry_t entry) direct_free: swapcache_free_entries(&entry, 1); } - - return 0; } swp_entry_t folio_alloc_swap(struct folio *folio)
The return value of free_swap_slot is always 0 and also ignored now. Remove it to clean up the code. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> --- include/linux/swap_slots.h | 2 +- mm/swap_slots.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-)