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

Commit 89d09a2c authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

[PATCH] swap: freeing update swap_list.next 



This makes negligible difference in practice: but swap_list.next should not be
updated to a higher prio in the general helper swap_info_get, but rather in
swap_entry_free; and then only in the case when entry is actually freed.

Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6eb396dc

mm/swapfile.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -215,8 +215,6 @@ static struct swap_info_struct * swap_info_get(swp_entry_t entry) 
	if (!p->swap_map[offset])

	if (!p->swap_map[offset])

		goto bad_free;

		goto bad_free;

	swap_list_lock();

	swap_list_lock();

	if (p->prio > swap_info[swap_list.next].prio)

		swap_list.next = type;

	swap_device_lock(p);

	swap_device_lock(p);

	return p;

	return p;
@@ -253,6 +251,8 @@ static int swap_entry_free(struct swap_info_struct *p, unsigned long offset) 
				p->lowest_bit = offset;

				p->lowest_bit = offset;

			if (offset > p->highest_bit)

			if (offset > p->highest_bit)

				p->highest_bit = offset;

				p->highest_bit = offset;

			if (p->prio > swap_info[swap_list.next].prio)

				swap_list.next = p - swap_info;

			nr_swap_pages++;

			nr_swap_pages++;

			p->inuse_pages--;

			p->inuse_pages--;

		}

		}