Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c69dbfb8 authored by Cesar Eduardo Barros's avatar Cesar Eduardo Barros Committed by Linus Torvalds
Browse files

sys_swapon: move printk outside lock 



The block in sys_swapon which does the final adjustments to the
swap_info_struct and to swap_list is the same as the block which
re-inserts it again at sys_swapoff on failure of try_to_unuse(). To be
able to make both share the same code, move the printk() call in the
middle of it to just after it.

Signed-off-by: default avatarCesar Eduardo Barros <cesarb@cesarb.net>
Tested-by: default avatarEric B Munson <emunson@mgebm.net>
Acked-by: default avatarEric B Munson <emunson@mgebm.net>
Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9c8100ef

mm/swapfile.c

+8 −7
Original line number Diff line number Diff line
@@ -2144,13 +2144,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) 
	nr_swap_pages += p->pages;

	total_swap_pages += p->pages;



	printk(KERN_INFO "Adding %uk swap on %s.  "

			"Priority:%d extents:%d across:%lluk %s%s\n",

		p->pages<<(PAGE_SHIFT-10), name, p->prio,

		nr_extents, (unsigned long long)span<<(PAGE_SHIFT-10),

		(p->flags & SWP_SOLIDSTATE) ? "SS" : "",

		(p->flags & SWP_DISCARDABLE) ? "D" : "");



	/* insert swap space into swap_list: */

	prev = -1;

	for (i = swap_list.head; i >= 0; i = swap_info[i]->next) {
@@ -2164,6 +2157,14 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) 
	else

		swap_info[prev]->next = p->type;

	spin_unlock(&swap_lock);



	printk(KERN_INFO "Adding %uk swap on %s.  "

			"Priority:%d extents:%d across:%lluk %s%s\n",

		p->pages<<(PAGE_SHIFT-10), name, p->prio,

		nr_extents, (unsigned long long)span<<(PAGE_SHIFT-10),

		(p->flags & SWP_SOLIDSTATE) ? "SS" : "",

		(p->flags & SWP_DISCARDABLE) ? "D" : "");



	mutex_unlock(&swapon_mutex);

	atomic_inc(&proc_poll_event);

	wake_up_interruptible(&proc_poll_wait);