|
@@ -2867,6 +2867,7 @@ late_initcall(max_swapfiles_check);
|
|
|
static struct swap_info_struct *alloc_swap_info(void)
|
|
|
{
|
|
|
struct swap_info_struct *p;
|
|
|
+ struct swap_info_struct *defer = NULL;
|
|
|
unsigned int type;
|
|
|
int i;
|
|
|
|
|
@@ -2895,7 +2896,7 @@ static struct swap_info_struct *alloc_swap_info(void)
|
|
|
smp_wmb();
|
|
|
WRITE_ONCE(nr_swapfiles, nr_swapfiles + 1);
|
|
|
} else {
|
|
|
- kvfree(p);
|
|
|
+ defer = p;
|
|
|
p = swap_info[type];
|
|
|
/*
|
|
|
* Do not memset this entry: a racing procfs swap_next()
|
|
@@ -2908,6 +2909,7 @@ static struct swap_info_struct *alloc_swap_info(void)
|
|
|
plist_node_init(&p->avail_lists[i], 0);
|
|
|
p->flags = SWP_USED;
|
|
|
spin_unlock(&swap_lock);
|
|
|
+ kvfree(defer);
|
|
|
spin_lock_init(&p->lock);
|
|
|
spin_lock_init(&p->cont_lock);
|
|
|
|