Cesar Eduardo Barros cf0cac0a09 mm: refactor reinsert of swap_info in sys_swapoff() ...

The block within sys_swapoff() which re-inserts the swap_info into the
swap_list in case of failure of try_to_unuse() reads a few values outside
the swap_lock.  While this is safe at that point, it is subtle code.

Simplify the code by moving the reading of these values to a separate
function, refactoring it a bit so they are read from within the swap_lock.
 This is easier to understand, and matches better the way it worked before
I unified the insertion of the swap_info from both sys_swapon and
sys_swapoff.

This change should make no functional difference.  The only real change is
moving the read of two or three structure fields to within the lock
(frontswap_map_get() is nothing more than a read of p->frontswap_map).

Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Dan Magenheimer <dan.magenheimer@oracle.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2012-12-11 17:22:24 -08:00

..

backing-dev.c

backing-dev: use kstrto* in preference to simple_strtoul

2012-08-25 16:58:14 +08:00

bootmem.c

revert "mm: fix-up zone present pages"

2012-11-16 14:33:04 -08:00

bounce.c

bounce: allow use of bounce pool via config option

2012-07-18 16:40:35 -04:00

cleancache.c

->encode_fh() API change

2012-05-29 23:28:33 -04:00

compaction.c

mm: compaction: validate pfn range passed to isolate_freepages_block

2012-12-06 11:17:33 -08:00

debug-pagealloc.c

mm, x86: Remove debug_pagealloc_enabled

2011-12-06 09:24:07 +01:00

dmapool.c

mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls

2012-12-11 09:28:08 +01:00

fadvise.c

switch simple cases of fget_light to fdget

2012-09-26 22:20:08 -04:00

failslab.c

switch debugfs to umode_t

2012-01-03 22:54:56 -05:00

filemap_xip.c

mm: move all mmu notifier invocations to be done outside the PT lock

2012-10-09 16:22:58 +09:00

filemap.c

readahead: fault retry breaks mmap file read random detection

2012-10-09 16:22:47 +09:00

fremap.c

remap_file_pages: correctly handle the case of a NULL vm_ops pointer

2012-10-19 13:37:57 -07:00

frontswap.c

frontswap: support exclusive gets if tmem backend is capable

2012-09-21 10:38:12 -04:00

highmem.c

mm: highmem: don't treat PKMAP_ADDR(LAST_PKMAP) as a highmem address

2012-11-16 14:33:04 -08:00

huge_memory.c

thp: cleanup: introduce mk_huge_pmd()

2012-12-11 17:22:22 -08:00

hugetlb_cgroup.c

hugetlb/cgroup: remove exclude and wakeup rmdir calls from migrate

2012-07-31 18:42:41 -07:00

hugetlb.c

numa: convert static memory to dynamically allocated memory for per node device

2012-12-11 17:22:23 -08:00

hwpoison-inject.c

memcg: rename config variables

2012-07-31 18:42:43 -07:00

init-mm.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

internal.h

mm: introduce mm_find_pmd()

2012-12-11 17:22:22 -08:00

interval_tree.c

mm: add CONFIG_DEBUG_VM_RB build option

2012-10-09 16:22:42 +09:00

Kconfig

mm: enable CONFIG_COMPACTION by default

2012-10-09 16:22:53 +09:00

Kconfig.debug

mm: more intensive memory corruption debugging

2012-01-10 16:30:42 -08:00

kmemcheck.c

…

kmemleak-test.c

…

kmemleak.c

kmemleak: use rbtree instead of prio tree

2012-10-09 16:22:39 +09:00

ksm.c

mm: introduce mm_find_pmd()

2012-12-11 17:22:22 -08:00

maccess.c

mm: Map most files to use export.h instead of module.h

2011-10-31 09:20:12 -04:00

madvise.c

mm: prepare VM_DONTDUMP for using in drivers

2012-10-09 16:22:18 +09:00

Makefile

mm: replace vma prio_tree with an interval tree

2012-10-09 16:22:39 +09:00

memblock.c

x86, mm: Trim memory in memblock to be page aligned

2012-10-24 11:52:21 -07:00

memcontrol.c

mm, memcg: make mem_cgroup_out_of_memory() static

2012-12-11 17:22:22 -08:00

memory_hotplug.c

mm/memory_hotplug.c: update start_pfn in zone and pg_data when spanned_pages == 0.

2012-12-11 17:22:23 -08:00

memory-failure.c

memory-hotplug: skip HWPoisoned page when offlining pages

2012-12-11 17:22:22 -08:00

memory.c

mm: fix build warning for uninitialized value

2012-11-16 14:33:03 -08:00

mempolicy.c

tmpfs: fix shared mempolicy leak

2012-12-06 11:56:43 -08:00

mempool.c

mempool: add @gfp_mask to mempool_create_node()

2012-06-25 11:53:47 +02:00

migrate.c

mm: introduce mm_find_pmd()

2012-12-11 17:22:22 -08:00

mincore.c

mm: thp: fix pmd_bad() triggering in code paths holding mmap_sem read mode

2012-03-21 17:54:54 -07:00

mlock.c

mm, thp: fix mlock statistics

2012-10-09 16:23:03 +09:00

mm_init.c

mm: Map most files to use export.h instead of module.h

2011-10-31 09:20:12 -04:00

mmap.c

mm: add anon_vma_lock to validate_mm()

2012-11-16 14:33:03 -08:00

mmu_context.c

mm, counters: remove task argument to sync_mm_rss() and __sync_task_rss_stat()

2012-03-21 17:54:59 -07:00

mmu_notifier.c

mm/mmu_notifier: allocate mmu_notifier in advance

2012-10-25 14:37:53 -07:00

mmzone.c

memcg: fix hotplugged memory zone oops

2012-11-16 14:33:04 -08:00

mprotect.c

Merge branch 'akpm' (Andrew's patch-bomb)

2012-03-22 09:04:48 -07:00

mremap.c

mm: move all mmu notifier invocations to be done outside the PT lock

2012-10-09 16:22:58 +09:00

msync.c

…

nobootmem.c

revert "mm: fix-up zone present pages"

2012-11-16 14:33:04 -08:00

nommu.c

mm: replace vma prio_tree with an interval tree

2012-10-09 16:22:39 +09:00

oom_kill.c

oom: remove deprecated oom_adj

2012-10-09 16:22:24 +09:00

page_alloc.c

memory-hotplug: allocate zone's pcp before onlining pages

2012-12-11 17:22:23 -08:00

page_cgroup.c

memory-hotplug: auto offline page_cgroup when onlining memory block failed

2012-12-11 17:22:23 -08:00

page_io.c

mm: add support for direct_IO to highmem pages

2012-07-31 18:42:47 -07:00

page_isolation.c

memory-hotplug: skip HWPoisoned page when offlining pages

2012-12-11 17:22:22 -08:00

page-writeback.c

writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr()

2012-12-11 17:22:21 -08:00

pagewalk.c

mm: fix kernel-doc warnings

2012-06-20 14:39:36 -07:00

percpu-km.c

…

percpu-vm.c

mm: fix kernel-doc warnings

2012-06-20 14:39:36 -07:00

percpu.c

sections: fix section conflicts in mm/percpu.c

2012-10-06 03:04:44 +09:00

pgtable-generic.c

thp: introduce pmdp_invalidate()

2012-10-09 16:22:29 +09:00

process_vm_access.c

aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()

2012-05-31 17:49:32 -07:00

quicklist.c

mm: delete various needless include <linux/module.h>

2011-10-31 09:20:11 -04:00

readahead.c

switch simple cases of fget_light to fdget

2012-09-26 22:20:08 -04:00

rmap.c

mm: add comment on storage key dirty bit semantics

2012-12-11 17:22:23 -08:00

shmem.c

tmpfs: fix shared mempolicy leak

2012-12-06 11:56:43 -08:00

slab_common.c

mm, slab: release slab_mutex earlier in kmem_cache_destroy()

2012-10-10 09:25:08 +03:00

slab.c

Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux

2012-10-07 07:53:13 +09:00

slab.h

Revert "mm/sl[aou]b: Move sysfs_slab_add to common"

2012-09-05 12:07:44 +03:00

slob.c

Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes

2012-10-19 15:40:18 -07:00

slub.c

slub, hotplug: ignore unrelated node's hot-adding and hot-removing

2012-12-11 17:22:23 -08:00

sparse-vmemmap.c

mm: delete various needless include <linux/module.h>

2011-10-31 09:20:11 -04:00

sparse.c

memory-hotplug, mm/sparse.c: clear the memory to store struct page

2012-12-11 17:22:23 -08:00

swap_state.c

mm: add support for a filesystem to activate swap files and use direct_IO for writing swap pages

2012-07-31 18:42:47 -07:00

swap.c

mm: remove vma arg from page_evictable

2012-10-09 16:22:55 +09:00

swapfile.c

mm: refactor reinsert of swap_info in sys_swapoff()

2012-12-11 17:22:24 -08:00

truncate.c

mm: use clear_page_mlock() in page_remove_rmap()

2012-10-09 16:22:56 +09:00

util.c

mm: Use __do_krealloc to do the krealloc job

2012-09-04 10:22:58 +03:00

vmalloc.c

mm: use IS_ENABLED(CONFIG_NUMA) instead of NUMA_BUILD

2012-12-11 17:22:22 -08:00

vmscan.c

mm,vmscan: only evict file pages when we have plenty

2012-12-11 17:22:23 -08:00

vmstat.c

mm: remove unevictable_pgs_mlockfreed

2012-10-09 16:22:59 +09:00