mm: frontswap: split out __frontswap_curr_pages

[~andy/linux] / mm / frontswap.c

diff --git a/mm/frontswap.c b/mm/frontswap.c
index e25025574a024af071c387511cea2460fd566dec..5faf840f872614d6d33e2391bd0795a5a6333685 100644 (file)
--- a/mm/frontswap.c
+++ b/mm/frontswap.c
@@ -111,7 +111,7 @@ void __frontswap_init(unsigned type)
        if (sis->frontswap_map == NULL)
                return;
        if (frontswap_enabled)
-               (*frontswap_ops.init)(type);
+               frontswap_ops.init(type);
 }
 EXPORT_SYMBOL(__frontswap_init);
 
@@ -134,7 +134,7 @@ int __frontswap_store(struct page *page)
        BUG_ON(sis == NULL);
        if (frontswap_test(sis, offset))
                dup = 1;
-       ret = (*frontswap_ops.store)(type, offset, page);
+       ret = frontswap_ops.store(type, offset, page);
        if (ret == 0) {
                frontswap_set(sis, offset);
                inc_frontswap_succ_stores();
@@ -148,8 +148,9 @@ int __frontswap_store(struct page *page)
                frontswap_clear(sis, offset);
                atomic_dec(&sis->frontswap_pages);
                inc_frontswap_failed_stores();
-       } else
+       } else {
                inc_frontswap_failed_stores();
+       }
        if (frontswap_writethrough_enabled)
                /* report failure so swap also writes to swap device */
                ret = -1;
@@ -173,7 +174,7 @@ int __frontswap_load(struct page *page)
        BUG_ON(!PageLocked(page));
        BUG_ON(sis == NULL);
        if (frontswap_test(sis, offset))
-               ret = (*frontswap_ops.load)(type, offset, page);
+               ret = frontswap_ops.load(type, offset, page);
        if (ret == 0)
                inc_frontswap_loads();
        return ret;
@@ -190,7 +191,7 @@ void __frontswap_invalidate_page(unsigned type, pgoff_t offset)
 
        BUG_ON(sis == NULL);
        if (frontswap_test(sis, offset)) {
-               (*frontswap_ops.invalidate_page)(type, offset);
+               frontswap_ops.invalidate_page(type, offset);
                atomic_dec(&sis->frontswap_pages);
                frontswap_clear(sis, offset);
                inc_frontswap_invalidates();
@@ -209,12 +210,26 @@ void __frontswap_invalidate_area(unsigned type)
        BUG_ON(sis == NULL);
        if (sis->frontswap_map == NULL)
                return;
-       (*frontswap_ops.invalidate_area)(type);
+       frontswap_ops.invalidate_area(type);
        atomic_set(&sis->frontswap_pages, 0);
        memset(sis->frontswap_map, 0, sis->max / sizeof(long));
 }
 EXPORT_SYMBOL(__frontswap_invalidate_area);
 
+static unsigned long __frontswap_curr_pages(void)
+{
+       int type;
+       unsigned long totalpages = 0;
+       struct swap_info_struct *si = NULL;
+
+       assert_spin_locked(&swap_lock);
+       for (type = swap_list.head; type >= 0; type = si->next) {
+               si = swap_info[type];
+               totalpages += atomic_read(&si->frontswap_pages);
+       }
+       return totalpages;
+}
+
 /*
  * Frontswap, like a true swap device, may unnecessarily retain pages
  * under certain circumstances; "shrink" frontswap is essentially a
@@ -239,20 +254,16 @@ void frontswap_shrink(unsigned long target_pages)
         */
        spin_lock(&swap_lock);
        locked = true;
-       total_pages = 0;
-       for (type = swap_list.head; type >= 0; type = si->next) {
-               si = swap_info[type];
-               total_pages += atomic_read(&si->frontswap_pages);
-       }
+       total_pages = __frontswap_curr_pages();
        if (total_pages <= target_pages)
                goto out;
        total_pages_to_unuse = total_pages - target_pages;
        for (type = swap_list.head; type >= 0; type = si->next) {
                si = swap_info[type];
                si_frontswap_pages = atomic_read(&si->frontswap_pages);
-               if (total_pages_to_unuse < si_frontswap_pages)
+               if (total_pages_to_unuse < si_frontswap_pages) {
                        pages = pages_to_unuse = total_pages_to_unuse;
-               else {
+               } else {
                        pages = si_frontswap_pages;
                        pages_to_unuse = 0; /* unuse all */
                }
@@ -281,16 +292,12 @@ EXPORT_SYMBOL(frontswap_shrink);
  */
 unsigned long frontswap_curr_pages(void)
 {
-       int type;
        unsigned long totalpages = 0;
-       struct swap_info_struct *si = NULL;
 
        spin_lock(&swap_lock);
-       for (type = swap_list.head; type >= 0; type = si->next) {
-               si = swap_info[type];
-               totalpages += atomic_read(&si->frontswap_pages);
-       }
+       totalpages = __frontswap_curr_pages();
        spin_unlock(&swap_lock);
+
        return totalpages;
 }
 EXPORT_SYMBOL(frontswap_curr_pages);