mm/swap: fold __swap_info_get() into its sole caller

Fold __swap_info_get() into its sole caller to make code more clear.
Minor readability improvement.

Link: https://lkml.kernel.org/r/20220509131416.17553-4-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Naoya Horiguchi <naoya.horiguchi@nec.com>
Cc: NeilBrown <neilb@suse.de>
Cc: Peter Xu <peterx@redhat.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/swapfile.c b/mm/swapfile.c
index bfa41bf5e1906049a645573e249e021a2effdf24..570287b786cc86d1e61591c0cd129c35a20d33e6 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1122,7 +1122,7 @@ noswap:
        return n_ret;
 }
 
-static struct swap_info_struct *__swap_info_get(swp_entry_t entry)
+static struct swap_info_struct *_swap_info_get(swp_entry_t entry)
 {
        struct swap_info_struct *p;
        unsigned long offset;
@@ -1137,8 +1137,13 @@ static struct swap_info_struct *__swap_info_get(swp_entry_t entry)
        offset = swp_offset(entry);
        if (offset >= p->max)
                goto bad_offset;
+       if (data_race(!p->swap_map[swp_offset(entry)]))
+               goto bad_free;
        return p;
 
+bad_free:
+       pr_err("%s: %s%08lx\n", __func__, Unused_offset, entry.val);
+       goto out;
 bad_offset:
        pr_err("%s: %s%08lx\n", __func__, Bad_offset, entry.val);
        goto out;
@@ -1151,23 +1156,6 @@ out:
        return NULL;
 }
 
-static struct swap_info_struct *_swap_info_get(swp_entry_t entry)
-{
-       struct swap_info_struct *p;
-
-       p = __swap_info_get(entry);
-       if (!p)
-               goto out;
-       if (data_race(!p->swap_map[swp_offset(entry)]))
-               goto bad_free;
-       return p;
-
-bad_free:
-       pr_err("%s: %s%08lx\n", __func__, Unused_offset, entry.val);
-out:
-       return NULL;
-}
-
 static struct swap_info_struct *swap_info_get_cont(swp_entry_t entry,
                                        struct swap_info_struct *q)
 {