swap: try to scan more free slots even when fragmented

[mirror_ubuntu-kernels.git] / mm / zsmalloc.c

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 22d17ecfe7df464412426e2dc4079c541f28ae4d..2f836a2b993f0cf16a3cf2d6c28e8a52d30ba604 100644 (file)
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -424,7 +424,7 @@ static void *zs_zpool_map(void *pool, unsigned long handle,
        case ZPOOL_MM_WO:
                zs_mm = ZS_MM_WO;
                break;
-       case ZPOOL_MM_RW: /* fall through */
+       case ZPOOL_MM_RW:
        default:
                zs_mm = ZS_MM_RW;
                break;
@@ -891,12 +891,12 @@ static inline int trypin_tag(unsigned long handle)
        return bit_spin_trylock(HANDLE_PIN_BIT, (unsigned long *)handle);
 }
 
-static void pin_tag(unsigned long handle)
+static void pin_tag(unsigned long handle) __acquires(bitlock)
 {
        bit_spin_lock(HANDLE_PIN_BIT, (unsigned long *)handle);
 }
 
-static void unpin_tag(unsigned long handle)
+static void unpin_tag(unsigned long handle) __releases(bitlock)
 {
        bit_spin_unlock(HANDLE_PIN_BIT, (unsigned long *)handle);
 }
@@ -1833,12 +1833,12 @@ static void migrate_lock_init(struct zspage *zspage)
        rwlock_init(&zspage->lock);
 }
 
-static void migrate_read_lock(struct zspage *zspage)
+static void migrate_read_lock(struct zspage *zspage) __acquires(&zspage->lock)
 {
        read_lock(&zspage->lock);
 }
 
-static void migrate_read_unlock(struct zspage *zspage)
+static void migrate_read_unlock(struct zspage *zspage) __releases(&zspage->lock)
 {
        read_unlock(&zspage->lock);
 }