|
@@ -1923,7 +1923,6 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
|
|
p->swap_map = NULL;
|
|
p->swap_map = NULL;
|
|
cluster_info = p->cluster_info;
|
|
cluster_info = p->cluster_info;
|
|
p->cluster_info = NULL;
|
|
p->cluster_info = NULL;
|
|
- p->flags = 0;
|
|
|
|
frontswap_map = frontswap_map_get(p);
|
|
frontswap_map = frontswap_map_get(p);
|
|
spin_unlock(&p->lock);
|
|
spin_unlock(&p->lock);
|
|
spin_unlock(&swap_lock);
|
|
spin_unlock(&swap_lock);
|
|
@@ -1949,6 +1948,16 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
|
|
mutex_unlock(&inode->i_mutex);
|
|
mutex_unlock(&inode->i_mutex);
|
|
}
|
|
}
|
|
filp_close(swap_file, NULL);
|
|
filp_close(swap_file, NULL);
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * Clear the SWP_USED flag after all resources are freed so that swapon
|
|
|
|
+ * can reuse this swap_info in alloc_swap_info() safely. It is ok to
|
|
|
|
+ * not hold p->lock after we cleared its SWP_WRITEOK.
|
|
|
|
+ */
|
|
|
|
+ spin_lock(&swap_lock);
|
|
|
|
+ p->flags = 0;
|
|
|
|
+ spin_unlock(&swap_lock);
|
|
|
|
+
|
|
err = 0;
|
|
err = 0;
|
|
atomic_inc(&proc_poll_event);
|
|
atomic_inc(&proc_poll_event);
|
|
wake_up_interruptible(&proc_poll_wait);
|
|
wake_up_interruptible(&proc_poll_wait);
|