Shaohua Li 07fb30fa5b swap: don't do discard if no discard option added ...

commit 052b1987fa upstream.

When swapon() was not passed the SWAP_FLAG_DISCARD option, sys_swapon()
will still perform a discard operation.  This can cause problems if
discard is slow or buggy.

Reverse the order of the check so that a discard operation is performed
only if the sys_swapon() caller is attempting to enable discard.

Signed-off-by: Shaohua Li <shli@fusionio.com>
Reported-by: Holger Kiehl <Holger.Kiehl@dwd.de>
Tested-by: Holger Kiehl <Holger.Kiehl@dwd.de>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

2012-05-31 00:43:47 +01:00

..

backing-dev.c

backing-dev: fix wakeup timer races with bdi_unregister()

2012-02-20 12:46:18 -08:00

bootmem.c

bootmem/sparsemem: remove limit constraint in alloc_bootmem_section

2012-04-02 09:52:37 -07:00

bounce.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

cleancache.c

mm: cleancache core ops functions and config

2011-05-26 10:01:36 -06:00

compaction.c

mm: compaction: check for overlapping nodes during isolation for migration

2012-02-13 11:17:01 -08:00

debug-pagealloc.c

debug-pagealloc: add support for highmem pages

2011-10-31 17:30:48 -07:00

dmapool.c

mm: fix implicit stat.h usage in dmapool.c

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

fadvise.c

readahead: introduce FMODE_RANDOM for POSIX_FADV_RANDOM

2010-03-06 11:26:25 -08:00

failslab.c

fault-injection: add ability to export fault_attr in arbitrary directory

2011-08-03 14:25:20 -10:00

filemap_xip.c

mm/filemap_xip.c: fix race condition in xip_file_fault()

2012-02-13 11:16:54 -08:00

filemap.c

readahead: fix pipeline break caused by block plug

2012-02-13 11:16:50 -08:00

fremap.c

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

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

highmem.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

huge_memory.c

mm: thp: fix BUG on mm->nr_ptes

2012-03-12 12:31:26 -07:00

hugetlb.c

hugetlb: prevent BUG_ON in hugetlb_fault() -> hugetlb_cow()

2012-05-20 22:56:32 +01:00

hwpoison-inject.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

init-mm.c

atomic: use <linux/atomic.h>

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

internal.h

mm: thp: tail page refcounting fix

2011-11-02 16:06:57 -07:00

Kconfig

memblock: add NO_BOOTMEM config symbol

2011-10-31 17:30:47 -07:00

Kconfig.debug

mm: debug-pagealloc: fix kconfig dependency warning

2011-03-22 17:44:02 -07:00

kmemcheck.c

kmemcheck: Fix build errors due to missing slab.h

2010-03-30 22:02:32 +09:00

kmemleak-test.c

kmemleak: remove memset by using kzalloc

2011-01-27 18:31:51 +00:00

kmemleak.c

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

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

ksm.c

oom: fix race while temporarily setting current's oom_score_adj

2011-10-31 17:30:45 -07: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

fs: kill i_alloc_sem

2011-07-20 20:47:46 -04:00

Makefile

Cross Memory Attach

2011-10-31 17:30:44 -07:00

memblock.c

mm/memblock.c: quiet sparse noise

2011-10-31 17:30:50 -07:00

memcontrol.c

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

2012-04-02 09:52:37 -07:00

memory_hotplug.c

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

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

memory-failure.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

memory.c

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

2012-04-02 09:52:37 -07:00

mempolicy.c

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

2012-04-02 09:52:37 -07:00

mempool.c

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

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

migrate.c

mm/migrate.c: pair unlock_page() and lock_page() when migrating huge pages

2011-12-09 07:50:28 -08:00

mincore.c

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

2012-04-02 09:52:37 -07:00

mlock.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08: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

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

mmu_context.c

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

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

mmu_notifier.c

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

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

mmzone.c

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

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

mprotect.c

thp: mprotect: transparent huge page support

2011-01-13 17:32:44 -08:00

mremap.c

thp: mremap support and TLB optimization

2011-10-31 17:30:48 -07:00

msync.c

sanitize vfs_fsync calling conventions

2010-05-21 18:31:21 -04:00

nobootmem.c

mm: nobootmem: fix sign extend problem in __free_pages_memory()

2012-05-20 22:56:33 +01:00

nommu.c

NOMMU: Don't need to clear vm_mm when deleting a VMA

2012-03-12 12:31:25 -07:00

oom_kill.c

oom: fix integer overflow of points in oom_badness

2011-12-20 10:25:04 -08:00

page_alloc.c

mm: fix NULL ptr dereference in __count_immobile_pages

2012-01-25 16:13:59 -08:00

page_cgroup.c

mm/page_cgroup.c: quiet sparse noise

2011-11-02 16:07:00 -07:00

page_io.c

block: kill off REQ_UNPLUG

2011-03-10 08:52:27 +01:00

page_isolation.c

mm: page_isolation: codeclean fix comment and rm unneeded val init

2010-10-26 16:52:11 -07:00

page-writeback.c

writeback: set max_pause to lowest value on zero bdi_dirty

2011-12-08 10:49:29 +08:00

pagewalk.c

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

2012-04-02 09:52:37 -07:00

percpu-km.c

percpu: clear memory allocated with the km allocator

2010-10-02 10:28:42 +03:00

percpu-vm.c

percpu: fix chunk range calculation

2011-11-22 08:09:46 -08:00

percpu.c

percpu: pcpu_embed_first_chunk() should free unused parts after all allocs are complete

2012-05-20 22:56:31 +01:00

pgtable-generic.c

mm/pgtable-generic.c: fix CONFIG_SWAP=n build

2011-01-26 10:49:58 +10:00

prio_tree.c

sanitize <linux/prefetch.h> usage

2011-05-20 12:50:29 -07:00

process_vm_access.c

Cross Memory Attach

2011-10-31 17:30:44 -07:00

quicklist.c

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

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

readahead.c

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

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

rmap.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

shmem.c

SHM_UNLOCK: fix Unevictable pages stranded after swap

2012-01-25 16:13:59 -08:00

slab.c

slab, lockdep: Fix silly bug

2011-12-05 09:44:00 +01:00

slob.c

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

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

slub.c

slub: Do not hold slub_lock when calling sysfs_slab_add()

2012-04-02 09:53:06 -07:00

sparse-vmemmap.c

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

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

sparse.c

bootmem/sparsemem: remove limit constraint in alloc_bootmem_section

2012-04-02 09:52:37 -07:00

swap_state.c

mm: fix s390 BUG by __set_page_dirty_no_writeback on swap

2012-05-11 13:13:59 +01:00

swap.c

mm: fix UP THP spin_is_locked BUGs

2012-02-13 11:17:01 -08:00

swapfile.c

swap: don't do discard if no discard option added

2012-05-31 00:43:47 +01:00

thrash.c

mm/thrash.c: quiet sparse noise

2011-10-31 17:30:50 -07:00

truncate.c

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

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

util.c

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

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

vmalloc.c

mm/vmalloc.c: remove static declaration of va from __get_vm_area_node

2011-12-20 10:25:04 -08:00

vmscan.c

SHM_UNLOCK: fix Unevictable pages stranded after swap

2012-01-25 16:13:59 -08:00

vmstat.c

mm/vmstat.c: cache align vm_stat

2011-10-31 17:30:51 -07:00