summaryrefslogtreecommitdiffstats
path: root/mm/swapfile.c
diff options
context:
space:
mode:
authorHuang Ying2017-05-03 23:54:33 +0200
committerLinus Torvalds2017-05-04 00:52:10 +0200
commit9c1cc2e4f25c14dc1a2d98e98808aefef24abaf4 (patch)
tree90d7fbefa4ba009604633ce8d06cd8e3c64d3fac /mm/swapfile.c
parentmm: remove SWAP_[SUCCESS|AGAIN|FAIL] (diff)
downloadkernel-qcow2-linux-9c1cc2e4f25c14dc1a2d98e98808aefef24abaf4.tar.gz
kernel-qcow2-linux-9c1cc2e4f25c14dc1a2d98e98808aefef24abaf4.tar.xz
kernel-qcow2-linux-9c1cc2e4f25c14dc1a2d98e98808aefef24abaf4.zip
mm, swap: fix comment in __read_swap_cache_async
Commit cbab0e4eec29 ("swap: avoid read_swap_cache_async() race to deadlock while waiting on discard I/O completion") fixed a deadlock in read_swap_cache_async(). Because at that time, in swap allocation path, a swap entry may be set as SWAP_HAS_CACHE, then wait for discarding to complete before the page for the swap entry is added to the swap cache. But in commit 815c2c543d3a ("swap: make swap discard async"), the discarding for swap become asynchronous, waiting for discarding to complete will be done before the swap entry is set as SWAP_HAS_CACHE. So the comments in code is incorrect now. This patch fixes the comments. The cond_resched() added in the commit cbab0e4eec29 is not necessary now too. But if we added some sleep in swap allocation path in the future, there may be some hard to debug/reproduce deadlock bug. So it is kept. Link: http://lkml.kernel.org/r/20170317064635.12792-1-ying.huang@intel.com Signed-off-by: "Huang, Ying" <ying.huang@intel.com> Acked-by: Rafael Aquini <aquini@redhat.com> Cc: Shaohua Li <shli@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/swapfile.c')
0 files changed, 0 insertions, 0 deletions