2 files changed, 2 insertions, 3 deletions

diff --git a/include/linux/swap.h b/include/linux/swap.h
index 3a31cc25bd2c..410c8e473727 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -120,7 +120,6 @@ struct swap_extent {
 enum {
         SWP_USED        = (1 << 0),     /* is slot in swap_info[] used? */
         SWP_WRITEOK     = (1 << 1),     /* ok to write to this swap?    */
-        SWP_ACTIVE      = (SWP_USED | SWP_WRITEOK),
                                         /* add others here before... */
         SWP_SCANNING    = (1 << 8),     /* refcount in scan_swap_map */
 };
diff --git a/mm/swapfile.c b/mm/swapfile.c
index e2adc8eb9317..915cb3fc43d7 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1222,7 +1222,7 @@ asmlinkage long sys_swapoff(const char __user * specialfile)
         spin_lock(&swap_lock);
         for (type = swap_list.head; type >= 0; type = swap_info[type].next) {
                 p = swap_info + type;
-                if ((p->flags & SWP_ACTIVE) == SWP_ACTIVE) {
+                if (p->flags & SWP_WRITEOK) {
                         if (p->swap_file->f_mapping == mapping)
                                 break;
                 }
@@ -1674,7 +1674,7 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags)
         else
                 p->prio = --least_priority;
         p->swap_map = swap_map;
-        p->flags = SWP_ACTIVE;
+        p->flags |= SWP_WRITEOK;
         nr_swap_pages += nr_good_pages;
         total_swap_pages += nr_good_pages;