1 files changed, 14 insertions, 2 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index eb71b5d9430b..66e95eb73040 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2084,6 +2084,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
         vfree(frontswap_map);
         /* Destroy swap account information */
         swap_cgroup_swapoff(p->type);
+        exit_swap_address_space(p->type);
 
         inode = mapping->host;
         if (S_ISBLK(inode->i_mode)) {
@@ -2407,8 +2408,12 @@ static unsigned long read_swap_header(struct swap_info_struct *p,
         return maxpages;
 }
 
-#define SWAP_CLUSTER_COLS                                               \
+#define SWAP_CLUSTER_INFO_COLS                                          \
         DIV_ROUND_UP(L1_CACHE_BYTES, sizeof(struct swap_cluster_info))
+#define SWAP_CLUSTER_SPACE_COLS                                         \
+        DIV_ROUND_UP(SWAP_ADDRESS_SPACE_PAGES, SWAPFILE_CLUSTER)
+#define SWAP_CLUSTER_COLS                                               \
+        max_t(unsigned int, SWAP_CLUSTER_INFO_COLS, SWAP_CLUSTER_SPACE_COLS)
 
 static int setup_swap_map_and_extents(struct swap_info_struct *p,
                                         union swap_header *swap_header,
@@ -2471,7 +2476,10 @@ static int setup_swap_map_and_extents(struct swap_info_struct *p,
                 return nr_extents;
 
 
-        /* Reduce false cache line sharing between cluster_info */
+        /*
+         * Reduce false cache line sharing between cluster_info and
+         * sharing same address space.
+         */
         for (k = 0; k < SWAP_CLUSTER_COLS; k++) {
                 j = (k + col) % SWAP_CLUSTER_COLS;
                 for (i = 0; i < DIV_ROUND_UP(nr_clusters, SWAP_CLUSTER_COLS); i++) {
@@ -2661,6 +2669,10 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
                 }
         }
 
+        error = init_swap_address_space(p->type, maxpages);
+        if (error)
+                goto bad_swap;
+
         mutex_lock(&swapon_mutex);
         prio = -1;
         if (swap_flags & SWAP_FLAG_PREFER)