diff options
author | Thomas Betker <thomas.betker@rohde-schwarz.com> | 2015-11-10 22:18:15 +0100 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2016-02-25 12:11:25 +0100 |
commit | 157078f64b8a9cd7011b6b900b2f2498df850748 (patch) | |
tree | 7bfe4c748232f41764dcaa80c1810abacd70bef4 /fs/cachefiles | |
parent | MAINTAINERS: update Han's email (diff) | |
download | linux-157078f64b8a9cd7011b6b900b2f2498df850748.tar.xz linux-157078f64b8a9cd7011b6b900b2f2498df850748.zip |
Revert "jffs2: Fix lock acquisition order bug in jffs2_write_begin"
This reverts commit 5ffd3412ae55
("jffs2: Fix lock acquisition order bug in jffs2_write_begin").
The commit modified jffs2_write_begin() to remove a deadlock with
jffs2_garbage_collect_live(), but this introduced new deadlocks found
by multiple users. page_lock() actually has to be called before
mutex_lock(&c->alloc_sem) or mutex_lock(&f->sem) because
jffs2_write_end() and jffs2_readpage() are called with the page locked,
and they acquire c->alloc_sem and f->sem, resp.
In other words, the lock order in jffs2_write_begin() was correct, and
it is the jffs2_garbage_collect_live() path that has to be changed.
Revert the commit to get rid of the new deadlocks, and to clear the way
for a better fix of the original deadlock.
Reported-by: Deng Chao <deng.chao1@zte.com.cn>
Reported-by: Ming Liu <liu.ming50@gmail.com>
Reported-by: wangzaiwei <wangzaiwei@top-vision.cn>
Signed-off-by: Thomas Betker <thomas.betker@rohde-schwarz.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/cachefiles')
0 files changed, 0 insertions, 0 deletions